Re: [GIT PULL for v4.6-rc1] media updates

From: Linus Torvalds
Date: Wed May 04 2016 - 16:49:58 EST

On Wed, May 4, 2016 at 12:28 PM, Stefan Lippers-Hollmann <s.l-h@xxxxxx> 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


case? Judging by your oops stack trace, I think you currently have

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