From: Frank Schaefer <fschaefer.oss@googlemail.com>
Date: Fri, 17 Jan 2014 17:45:32 +0000 (-0300)
Subject: [media] em28xx-v4l: do not call em28xx_init_camera() if the device has no sensor
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d86bc65a64e1e1536d9f5f3287f8707997b4e8fc;p=linux-beck.git

[media] em28xx-v4l: do not call em28xx_init_camera() if the device has no sensor

This avoids the unnecessary temporary registration of a dummy V4L2 clock.

Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
---

diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
index 09e18da0b5cd..2775c9062c0a 100644
--- a/drivers/media/usb/em28xx/em28xx-video.c
+++ b/drivers/media/usb/em28xx/em28xx-video.c
@@ -2273,7 +2273,8 @@ static int em28xx_v4l2_init(struct em28xx *dev)
 	}
 
 	em28xx_tuner_setup(dev);
-	em28xx_init_camera(dev);
+	if (dev->em28xx_sensor != EM28XX_NOSENSOR)
+		em28xx_init_camera(dev);
 
 	/* Configure audio */
 	ret = em28xx_audio_setup(dev);