[media] em28xx: restore lost #ifdef
authorArnd Bergmann <arnd@arndb.de>
Fri, 26 Feb 2016 11:53:22 +0000 (08:53 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Thu, 3 Mar 2016 17:12:26 +0000 (14:12 -0300)
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>
drivers/media/usb/em28xx/em28xx-video.c

index f772e261260852c15455bb2899bd3e739bffdb0f..44834b2eff55a1d727db7e4822ea8a7cd3304d37 100644 (file)
@@ -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));