diff options
| author | Frank Schaefer <fschaefer.oss@googlemail.com> | 2014-01-17 18:45:32 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-02-04 19:41:21 +0100 |
| commit | d86bc65a64e1e1536d9f5f3287f8707997b4e8fc (patch) | |
| tree | 842e5d68dab3b4c1d53c72c4096fb1dcacf2407b /drivers/media/usb/em28xx/em28xx-video.c | |
| parent | [media] em28xx-camera: fix return value checks on sensor probing (diff) | |
| download | linux-d86bc65a64e1e1536d9f5f3287f8707997b4e8fc.tar.xz linux-d86bc65a64e1e1536d9f5f3287f8707997b4e8fc.zip | |
[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>
Diffstat (limited to 'drivers/media/usb/em28xx/em28xx-video.c')
| -rw-r--r-- | drivers/media/usb/em28xx/em28xx-video.c | 3 |
1 files changed, 2 insertions, 1 deletions
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); |