Messages in this thread | | | Date | Wed, 4 May 2016 23:45:40 +0200 | From | Stefan Lippers-Hollmann <> | Subject | Re: [GIT PULL for v4.6-rc1] media updates |
| |
Hi
On 2016-05-04, Linus Torvalds wrote: > On Wed, May 4, 2016 at 12:28 PM, Stefan Lippers-Hollmann <s.l-h@gmx.de> wrote: > > > > --- 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) > > Ok, that should be fine. Can you verify that it builds and works even > if USB isn't compiled in, but the media core code is? > > IOW, can you test the > > CONFIG_USB=m > CONFIG_MEDIA_CONTROLLER=y > CONFIG_MEDIA_SUPPORT=y
Builds (without warnings in drivers/media/media-device.*) and works fine as well.
> case? Judging by your oops stack trace, I think you currently have > MEDIA_SUPPORT=m.
My usual configuration (which, as mentioned in the previous mail, now builds and works as well) is:
CONFIG_MEDIA_SUPPORT=m CONFIG_MEDIA_CONTROLLER=y CONFIG_USB=m
> Also, I do wonder if we should move that #if to _outside_ the > function. Because inside the function, things will compile but > silently not work (like you found), if it is ever mis-used. Outside > that function, you'll get link-errors if you try to misuse that > function.
That would probably be the best approach.
Regards Stefan Lippers-Hollmann
| |