Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d37ba62 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Mauro Carvalho Chehab
Browse files

[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: de390787 ("[media] em2xx: use v4l2_mc_create_media_graph()")

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent bc717d5e

drivers/media/usb/em28xx/em28xx-video.c

+2 −0
Original line number Diff line number Diff line
@@ -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));