Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 908f7865 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: isp: Release hw if reset hw times out after init_hw"

parents e425d9de 21de0dc5

drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c

+1 −0
Original line number Diff line number Diff line
@@ -1433,6 +1433,7 @@ int msm_isp_open_node(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) 
	rc = vfe_dev->hw_info->vfe_ops.core_ops.reset_hw(vfe_dev);

	if (rc <= 0) {

		pr_err("%s: reset timeout\n", __func__);

		vfe_dev->hw_info->vfe_ops.core_ops.release_hw(vfe_dev);

		vfe_dev->vfe_open_cnt--;

		mutex_unlock(&vfe_dev->core_mutex);

		mutex_unlock(&vfe_dev->realtime_mutex);