Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1296769

Re: [PATCH] next: media: cx231xx: add #ifdef to fix compile error

Show all headers | View raw

Hello Okash,

On 12/22/2015 07:27 AM, Okash Khawaja wrote:
> Compiling linux-next gave this warning:
> 
> drivers/media/usb/cx231xx/cx231xx-cards.c: In function
> ‘cx231xx_usb_probe’:
> drivers/media/usb/cx231xx/cx231xx-cards.c:1754:36: error: ‘struct
> cx231xx’ has no member named ‘media_dev’
>   retval = media_device_register(dev->media_dev);
> 
> Looking at the refactoring in past two commits, following seems like a
> decent fix, i.e. to surround dev->media_dev by #ifdef
> CONFIG_MEDIA_CONTROLLER.
> 
> Signed-off-by: Okash Khawaja <okash.khawaja@gmail.com>
> ---
>  drivers/media/usb/cx231xx/cx231xx-cards.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/media/usb/cx231xx/cx231xx-cards.c b/drivers/media/usb/cx231xx/cx231xx-cards.c
> index 35692d1..220a5db 100644
> --- a/drivers/media/usb/cx231xx/cx231xx-cards.c
> +++ b/drivers/media/usb/cx231xx/cx231xx-cards.c
> @@ -1751,7 +1751,9 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
>  	if (retval < 0)
>  		goto done;
>  
> +#ifdef CONFIG_MEDIA_CONTROLLER
>  	retval = media_device_register(dev->media_dev);
> +#endif
>  
>  done:
>  	if (retval < 0)
>

Thanks for your patch, I've posted the same fix already:

https://lkml.org/lkml/2015/12/21/270

Best regards,
-- 
Javier Martinez Canillas
Open Source Group
Samsung Research America
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH] next: media: cx231xx: add #ifdef to fix compile error Okash Khawaja <okash.khawaja@gmail.com> - 2015-12-22 11:30 +0100
  Re: [PATCH] next: media: cx231xx: add #ifdef to fix compile error Javier Martinez Canillas <javier@osg.samsung.com> - 2015-12-22 13:50 +0100
    Re: [PATCH] next: media: cx231xx: add #ifdef to fix compile error Okash Khawaja <okash.khawaja@gmail.com> - 2015-12-22 14:10 +0100
      Re: [PATCH] next: media: cx231xx: add #ifdef to fix compile error Javier Martinez Canillas <javier@osg.samsung.com> - 2015-12-22 14:10 +0100
        Re: [PATCH] next: media: cx231xx: add #ifdef to fix compile error Okash Khawaja <okash.khawaja@gmail.com> - 2015-12-22 14:40 +0100

csiph-web