diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-02-26 08:53:22 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-03-03 14:12:26 -0300 |
| commit | 0d37ba6250d3b412796ee69169655f0eb2ada279 (patch) | |
| tree | 513f8f3e6a76a4aff3a433157df84cf3f79a6aba /drivers | |
| parent | bc717d5e92c8c079280eb4acbe335c6f25041aa2 (diff) | |
| download | linux-stable-0d37ba6250d3b412796ee69169655f0eb2ada279.tar.gz linux-stable-0d37ba6250d3b412796ee69169655f0eb2ada279.tar.bz2 linux-stable-0d37ba6250d3b412796ee69169655f0eb2ada279.zip | |
[media] em28xx: restore lost #ifdef
The cleanup that changed the em28xx driver to use v4l2_mc_create_media_graph
instead of its own implementation causes a build error when CONFIG_MEDIA_CONTROLLER
is disabled:
drivers/media/usb/em28xx/em28xx-video.c: In function 'em28xx_v4l2_init':
drivers/media/usb/em28xx/em28xx-video.c:2717:38: error: 'struct em28xx' has no member named 'media_dev'
This puts the new code inside the same #ifdef that controls the presence
of the 'media_dev' member, and that the old code was in.
Fixes: de39078779cb ("[media] em2xx: use v4l2_mc_create_media_graph()")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/usb/em28xx/em28xx-video.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c index f772e2612608..44834b2eff55 100644 --- a/drivers/media/usb/em28xx/em28xx-video.c +++ b/drivers/media/usb/em28xx/em28xx-video.c @@ -2714,12 +2714,14 @@ static int em28xx_v4l2_init(struct em28xx *dev) /* Init entities at the Media Controller */ em28xx_v4l2_create_entities(dev); +#ifdef CONFIG_MEDIA_CONTROLLER ret = v4l2_mc_create_media_graph(dev->media_dev); if (ret) { em28xx_errdev("failed to create media graph\n"); em28xx_v4l2_media_release(dev); goto unregister_dev; } +#endif em28xx_info("V4L2 video device registered as %s\n", video_device_node_name(&v4l2->vdev)); |