diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2012-07-18 17:54:01 +0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-08-15 23:53:39 +0400 |
| commit | 37ad4e734bbc27ad1bec2d1cc3ffaa79b1def262 (patch) | |
| tree | 1ac17daac0e198d545bbf0a170ef2a1ccf973484 /drivers/media | |
| parent | 2c3fb08b3f74b8792004095a1f6881a3296ff643 (diff) | |
| download | linux-37ad4e734bbc27ad1bec2d1cc3ffaa79b1def262.tar.xz | |
[media] soc_camera: Don't call .s_power() during probe
The .s_power() call only covers the .g_mbus_fmt() operation call.
Several clients required to be powered on to retrieve the current mbus
format but have now been fixed. The .s_power() call is thus not needed
anymore and can be removed.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/platform/soc_camera.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/media/platform/soc_camera.c b/drivers/media/platform/soc_camera.c index 9758217470f0..a6d484f38a88 100644 --- a/drivers/media/platform/soc_camera.c +++ b/drivers/media/platform/soc_camera.c @@ -1146,10 +1146,6 @@ static int soc_camera_probe(struct soc_camera_device *icd) if (ret < 0) goto evidstart; - ret = v4l2_subdev_call(sd, core, s_power, 1); - if (ret < 0 && ret != -ENOIOCTLCMD) - goto esdpwr; - /* Try to improve our guess of a reasonable window format */ if (!v4l2_subdev_call(sd, video, g_mbus_fmt, &mf)) { icd->user_width = mf.width; @@ -1166,8 +1162,6 @@ static int soc_camera_probe(struct soc_camera_device *icd) return 0; -esdpwr: - video_unregister_device(icd->vdev); evidstart: mutex_unlock(&icd->video_lock); soc_camera_free_user_formats(icd); |