diff options
| author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-02-18 12:02:09 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-02-26 08:43:49 -0300 |
| commit | 63ba8c75188e1122bd5c4a19321d1913367010c6 (patch) | |
| tree | 15f87378944a42677444016810517a9ac29470d9 /drivers/media/usb/cx231xx/cx231xx-cards.c | |
| 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>
Diffstat (limited to 'drivers/media/usb/cx231xx/cx231xx-cards.c')
| -rw-r--r-- | drivers/media/usb/cx231xx/cx231xx-cards.c | 2 |
1 files changed, 2 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, 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"); |