diff options
author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-02-18 10:02:09 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-02-26 06:43:49 -0500 |
commit | 63ba8c75188e1122bd5c4a19321d1913367010c6 (patch) | |
tree | 15f87378944a42677444016810517a9ac29470d9 | |
parent | c1bd57d30bf1b72134d1049b9b169afa96c4d030 (diff) |
[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 <fengguang.wu@intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r-- | drivers/media/usb/cx231xx/cx231xx-cards.c | 2 | ||||
-rw-r--r-- | drivers/media/usb/cx231xx/cx231xx-dvb.c | 2 |
2 files changed, 4 insertions, 0 deletions
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, | |||
1586 | cx231xx_media_device_register(dev, udev); | 1586 | cx231xx_media_device_register(dev, udev); |
1587 | 1587 | ||
1588 | /* Create v4l2 device */ | 1588 | /* Create v4l2 device */ |
1589 | #ifdef CONFIG_MEDIA_CONTROLLER | ||
1589 | dev->v4l2_dev.mdev = dev->media_dev; | 1590 | dev->v4l2_dev.mdev = dev->media_dev; |
1591 | #endif | ||
1590 | retval = v4l2_device_register(&interface->dev, &dev->v4l2_dev); | 1592 | retval = v4l2_device_register(&interface->dev, &dev->v4l2_dev); |
1591 | if (retval) { | 1593 | if (retval) { |
1592 | dev_err(d, "v4l2_device_register failed\n"); | 1594 | 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, | |||
540 | 540 | ||
541 | /* register network adapter */ | 541 | /* register network adapter */ |
542 | dvb_net_init(&dvb->adapter, &dvb->net, &dvb->demux.dmx); | 542 | dvb_net_init(&dvb->adapter, &dvb->net, &dvb->demux.dmx); |
543 | #ifdef CONFIG_MEDIA_CONTROLLER_DVB | ||
543 | dvb_create_media_graph(dev->media_dev); | 544 | dvb_create_media_graph(dev->media_dev); |
545 | #endif | ||
544 | return 0; | 546 | return 0; |
545 | 547 | ||
546 | fail_fe_conn: | 548 | fail_fe_conn: |