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

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

Merge "msm:ais: Remove recursive locks"

parents 3d8551da 84c40e8f

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

+0 −4
Original line number Diff line number Diff line
@@ -919,9 +919,7 @@ static long msm_isp_ioctl_unlocked(struct v4l2_subdev *sd, 
		break;

	case VIDIOC_MSM_ISP_CFG_STREAM:

		mutex_lock(&vfe_dev->core_mutex);

		mutex_lock(&vfe_dev->buf_mgr->lock);

		rc = msm_isp_cfg_axi_stream(vfe_dev, arg);

		mutex_unlock(&vfe_dev->buf_mgr->lock);

		mutex_unlock(&vfe_dev->core_mutex);

		break;

	case VIDIOC_MSM_ISP_CFG_HW_STATE:
@@ -1022,9 +1020,7 @@ static long msm_isp_ioctl_unlocked(struct v4l2_subdev *sd, 
		break;

	case VIDIOC_MSM_ISP_CFG_STATS_STREAM:

		mutex_lock(&vfe_dev->core_mutex);

		mutex_lock(&vfe_dev->buf_mgr->lock);

		rc = msm_isp_cfg_stats_stream(vfe_dev, arg);

		mutex_unlock(&vfe_dev->buf_mgr->lock);

		mutex_unlock(&vfe_dev->core_mutex);

		break;

	case VIDIOC_MSM_ISP_UPDATE_STATS_STREAM: