From: Mauro Carvalho Chehab Date: Wed, 18 Feb 2015 15:02:09 +0000 (-0300) Subject: [media] cx231xx: fix compilation if the media controller is not defined X-Git-Tag: firefly_0821_release~176^2~795^2~1377 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=63ba8c75188e1122bd5c4a19321d1913367010c6;p=firefly-linux-kernel-4.4.55.git [media] cx231xx: fix compilation if the media controller is not defined drivers/media/usb/cx231xx/cx231xx-cards.c: In function ‘cx231xx_usb_probe’: drivers/media/usb/cx231xx/cx231xx-cards.c:1589:15: error: ‘struct v4l2_device’ has no member named ‘mdev’ dev->v4l2_dev.mdev = dev->media_dev; ^ drivers/media/usb/cx231xx/cx231xx-cards.c:1589:26: error: ‘struct cx231xx’ has no member named ‘media_dev’ dev->v4l2_dev.mdev = dev->media_dev; ^ scripts/Makefile.build:257: recipe for target 'drivers/media/usb/cx231xx/cx231xx-cards.o' failed Reported-by: kbuild test robot Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/usb/cx231xx/cx231xx-cards.c b/drivers/media/usb/cx231xx/cx231xx-cards.c index dfc7010cff7f..372b70eb042c 100644 --- a/drivers/media/usb/cx231xx/cx231xx-cards.c +++ b/drivers/media/usb/cx231xx/cx231xx-cards.c @@ -1586,7 +1586,9 @@ static int cx231xx_usb_probe(struct usb_interface *interface, cx231xx_media_device_register(dev, udev); /* Create v4l2 device */ +#ifdef CONFIG_MEDIA_CONTROLLER dev->v4l2_dev.mdev = dev->media_dev; +#endif retval = v4l2_device_register(&interface->dev, &dev->v4l2_dev); if (retval) { dev_err(d, "v4l2_device_register failed\n"); diff --git a/drivers/media/usb/cx231xx/cx231xx-dvb.c b/drivers/media/usb/cx231xx/cx231xx-dvb.c index e8c054c4ac8c..44229a2c2d32 100644 --- a/drivers/media/usb/cx231xx/cx231xx-dvb.c +++ b/drivers/media/usb/cx231xx/cx231xx-dvb.c @@ -540,7 +540,9 @@ static int register_dvb(struct cx231xx_dvb *dvb, /* register network adapter */ dvb_net_init(&dvb->adapter, &dvb->net, &dvb->demux.dmx); +#ifdef CONFIG_MEDIA_CONTROLLER_DVB dvb_create_media_graph(dev->media_dev); +#endif return 0; fail_fe_conn: