aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJavier Martinez Canillas <javier@osg.samsung.com>2015-12-21 13:36:18 (GMT)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-12-23 13:28:22 (GMT)
commitda45c8a0a463678e2f22c711d30bedaadc5e4959 (patch)
treec9766cd6ff430bdc00c7c6b4f45eac5f3b739522
parent9289f8eaadbede0c84856dd974fe1f485a954274 (diff)
[media] uvcvideo: Only register media dev if MEDIA_CONTROLLER is definedold/cs_da45c8a0a463
Commit 1590ad7b5271 ("[media] media-device: split media initialization and registration") split the media dev initialization and registration but introduced a build error since media_device_register() was called unconditionally even when the MEDIA_CONTROLLER config was not enabled: from drivers/media/usb/uvc/uvc_driver.c:14: drivers/media/usb/uvc/uvc_driver.c: In function 'uvc_probe': drivers/media/usb/uvc/uvc_driver.c:1960:32: error: 'struct uvc_device' has no member named 'mdev' if (media_device_register(&dev->mdev) < 0) Fixes: 1590ad7b5271 ("[media] media-device: split media initialization and registration") Reported-by: Fengguang Wu <fengguang.wu@intel.com> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
-rw-r--r--drivers/media/usb/uvc/uvc_driver.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
index ddf035a..5993903 100644
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
@@ -1957,10 +1957,11 @@ static int uvc_probe(struct usb_interface *intf,
if (uvc_register_chains(dev) < 0)
goto error;
+#ifdef CONFIG_MEDIA_CONTROLLER
/* Register the media device node */
if (media_device_register(&dev->mdev) < 0)
goto error;
-
+#endif
/* Save our data pointer in the interface data. */
usb_set_intfdata(intf, dev);

Privacy Policy