aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-12-16 14:09:32 -0200
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-12-23 11:24:54 -0200
commitf7cbcee965f678666d5c86f3f1c676fe71200fb0 (patch)
tree1bff17dfb9dc009a87d5f29ba02c6d851edec4f0
parent0a3c36e2b81cf4fe4b6d094b27259716f0ed9a4d (diff)
[media] au0828-core: fix compilation when !CONFIG_MEDIA_CONTROLLER
commit 1590ad7b52714 ("[media] media-device: split media initialization and registration") moved the media controller register to a separate function. That caused the following compilation issue, if !CONFIG_MEDIA_CONTROLLER: vim +445 drivers/media/usb/au0828/au0828-core.c 439 if (retval) { 440 pr_err("%s() au0282_dev_register failed to create graph\n", 441 __func__); 442 goto done; 443 } 444 > 445 retval = media_device_register(dev->media_dev); 446 447 done: 448 if (retval < 0) 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/au0828/au0828-core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/usb/au0828/au0828-core.c b/drivers/media/usb/au0828/au0828-core.c
index 2f91bbc633b4..101d32954fe8 100644
--- a/drivers/media/usb/au0828/au0828-core.c
+++ b/drivers/media/usb/au0828/au0828-core.c
@@ -458,7 +458,9 @@ static int au0828_usb_probe(struct usb_interface *interface,
goto done;
}
+#ifdef CONFIG_MEDIA_CONTROLLER
retval = media_device_register(dev->media_dev);
+#endif
done:
if (retval < 0)

Privacy Policy