From: Stefan Lippers-Hollmann <s.l-h@gmx.de>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mauro Carvalho Chehab <mchehab@osg.samsung.com>,
Linux Media Mailing List <linux-media@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [GIT PULL for v4.6-rc1] media updates
Date: Wed, 4 May 2016 21:28:45 +0200 [thread overview]
Message-ID: <20160504212845.21dab7c8@mir> (raw)
In-Reply-To: <CA+55aFyE82Hi29az_MG9oG0=AEg1o++Wng_DO2RvNHQsSOz87g@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1475 bytes --]
Hi
On 2016-05-04, Linus Torvalds wrote:
> On Tue, May 3, 2016 at 9:39 PM, Stefan Lippers-Hollmann <s.l-h@gmx.de> wrote:
> >
> > Just as a cross-check, this (incomplete, but au0828, cx231xx and em28xx
> > aren't needed/ loaded on my system) crude revert avoids the problem for
> > me on v4.6-rc6-113-g83858a7.
>
> Hmm.
>
> That just open-codes __media_device_usb_init().
>
> The main difference seems to be that __media_device_usb_init() ends up
> having that
>
> #ifdef CONFIG_USB
> #endif
>
> around it.
>
> I think that is bogus.
>
> What happens if you replace that #ifdef CONFIG_USB in
> __media_device_usb_init() with
>
> #if CONFIG_USB || (MODULE && CONFIG_USB_MODULE)
[...]
that throws
drivers/media/media-device.c: In function '__media_device_usb_init':
drivers/media/media-device.c:878:5: warning: "CONFIG_USB" is not defined [-Wundef]
#if CONFIG_USB || (MODULE && CONFIG_USB_MODULE)
^
however, taking arch/arm/mach-omap1/include/mach/usb.h as example,
changing it to
--- a/drivers/media/media-device.c
+++ b/drivers/media/media-device.c
@@ -875,7 +875,7 @@ void __media_device_usb_init(struct medi
const char *board_name,
const char *driver_name)
{
-#ifdef CONFIG_USB
+#if defined(CONFIG_USB) || defined(CONFIG_USB_MODULE)
mdev->dev = &udev->dev;
if (driver_name)
indeed fixes the problem for me
Thanks a lot!
Regards
Stefan Lippers-Hollmann
[-- Attachment #2: Digitale Signatur von OpenPGP --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2016-05-04 19:29 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-15 11:05 [GIT PULL for v4.6-rc1] media updates Mauro Carvalho Chehab
2016-05-03 21:38 ` Stefan Lippers-Hollmann
2016-05-03 21:53 ` Linus Torvalds
2016-05-04 4:39 ` Stefan Lippers-Hollmann
2016-05-04 17:58 ` Linus Torvalds
2016-05-04 19:28 ` Stefan Lippers-Hollmann [this message]
2016-05-04 20:49 ` Linus Torvalds
2016-05-04 21:45 ` Stefan Lippers-Hollmann
2016-05-04 21:51 ` Mauro Carvalho Chehab
2016-05-04 23:00 ` Stefan Lippers-Hollmann
2016-05-05 11:07 ` Mauro Carvalho Chehab
2016-05-06 0:00 ` Stefan Lippers-Hollmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160504212845.21dab7c8@mir \
--to=s.l-h@gmx.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@osg.samsung.com \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox