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:
drivers/media/usb/cx231xx/cx231xx-cards.c: In function 'cx231xx_usb_probe':
drivers/media/usb/cx231xx/cx231xx-cards.c:1741:36: error: 'struct cx231xx'
has no member named 'media_dev'
retval = media_device_register(dev->media_dev);
Fixes: 1590ad7b5271 ("[media] media-device: split media initialization and
registration")
Reported-by: Fengguang Wu <fengguang...@intel.com>
Signed-off-by: Javier Martinez Canillas <jav...@osg.samsung.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 35692d19b652..220a5dba8a2d 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)
--
2.4.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
