Commit 37ad4e73 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab

[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: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 2c3fb08b
...@@ -1146,10 +1146,6 @@ static int soc_camera_probe(struct soc_camera_device *icd) ...@@ -1146,10 +1146,6 @@ static int soc_camera_probe(struct soc_camera_device *icd)
if (ret < 0) if (ret < 0)
goto evidstart; 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 */ /* Try to improve our guess of a reasonable window format */
if (!v4l2_subdev_call(sd, video, g_mbus_fmt, &mf)) { if (!v4l2_subdev_call(sd, video, g_mbus_fmt, &mf)) {
icd->user_width = mf.width; icd->user_width = mf.width;
...@@ -1166,8 +1162,6 @@ static int soc_camera_probe(struct soc_camera_device *icd) ...@@ -1166,8 +1162,6 @@ static int soc_camera_probe(struct soc_camera_device *icd)
return 0; return 0;
esdpwr:
video_unregister_device(icd->vdev);
evidstart: evidstart:
mutex_unlock(&icd->video_lock); mutex_unlock(&icd->video_lock);
soc_camera_free_user_formats(icd); soc_camera_free_user_formats(icd);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment