aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2012-07-18 09:54:01 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-08-15 15:53:39 -0400
commit37ad4e734bbc27ad1bec2d1cc3ffaa79b1def262 (patch)
tree1ac17daac0e198d545bbf0a170ef2a1ccf973484 /drivers/media
parent2c3fb08b3f74b8792004095a1f6881a3296ff643 (diff)
[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.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/media/platform/soc_camera.c b/drivers/media/platform/soc_camera.c
index 9758217470f..a6d484f38a8 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)
1146 if (ret < 0) 1146 if (ret < 0)
1147 goto evidstart; 1147 goto evidstart;
1148 1148
1149 ret = v4l2_subdev_call(sd, core, s_power, 1);
1150 if (ret < 0 && ret != -ENOIOCTLCMD)
1151 goto esdpwr;
1152
1153 /* Try to improve our guess of a reasonable window format */ 1149 /* Try to improve our guess of a reasonable window format */
1154 if (!v4l2_subdev_call(sd, video, g_mbus_fmt, &mf)) { 1150 if (!v4l2_subdev_call(sd, video, g_mbus_fmt, &mf)) {
1155 icd->user_width = mf.width; 1151 icd->user_width = mf.width;
@@ -1166,8 +1162,6 @@ static int soc_camera_probe(struct soc_camera_device *icd)
1166 1162
1167 return 0; 1163 return 0;
1168 1164
1169esdpwr:
1170 video_unregister_device(icd->vdev);
1171evidstart: 1165evidstart:
1172 mutex_unlock(&icd->video_lock); 1166 mutex_unlock(&icd->video_lock);
1173 soc_camera_free_user_formats(icd); 1167 soc_camera_free_user_formats(icd);