Messages in this thread Patch in this message | | | Date | Wed, 4 May 2016 21:28:45 +0200 | From | Stefan Lippers-Hollmann <> | Subject | Re: [GIT PULL for v4.6-rc1] media updates |
| |
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 [unhandled content-type:application/pgp-signature] | |