[media] soc_camera: Don't call .s_power() during probe (37ad4e73) · Commits · 戴 / test

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>

drivers/media/platform/soc_camera.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -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);

Admin message