Message ID | 20151222102721.GA1892@bytefire-computer (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
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,
On Tue, Dec 22, 2015 at 09:46:19AM -0300, Javier Martinez Canillas wrote: > 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 Cool. There was another similar compile error https://lkml.org/lkml/2015/12/22/196 Thanks, Okash -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hello Okash, On 12/22/2015 10:00 AM, Okash Khawaja wrote: [snip] > > Cool. There was another similar compile error > > https://lkml.org/lkml/2015/12/22/196 > Yes and you can see in that thread that I also mention that was fixed already :) > Thanks, > Okash > Best regards,
> On 22 Dec 2015, at 13:08, Javier Martinez Canillas <javier@osg.samsung.com> wrote: > > Hello Okash, > > On 12/22/2015 10:00 AM, Okash Khawaja wrote: > > [snip] > >> >> Cool. There was another similar compile error >> >> https://lkml.org/lkml/2015/12/22/196 > > Yes and you can see in that thread that I also mention > that was fixed already :) > >> Thanks, >> Okash > > Best regards, > -- > Javier Martinez Canillas > Open Source Group > Samsung Research America Of course! I'm blind. -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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)
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(+)