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

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

Merge "msm: camera: isp: Use different mutex for vfe reg update and buf mgr"

parents c2f950d3 5171793b

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -644,9 +644,9 @@ static long msm_isp_ioctl_unlocked(struct v4l2_subdev *sd, 
	case VIDIOC_MSM_ISP_REQUEST_BUF:

	case VIDIOC_MSM_ISP_REQUEST_BUF:

	case VIDIOC_MSM_ISP_ENQUEUE_BUF:

	case VIDIOC_MSM_ISP_ENQUEUE_BUF:

	case VIDIOC_MSM_ISP_RELEASE_BUF: {

	case VIDIOC_MSM_ISP_RELEASE_BUF: {

		mutex_lock(&vfe_dev->realtime_mutex);

		mutex_lock(&vfe_dev->core_mutex);

		rc = msm_isp_proc_buf_cmd(vfe_dev->buf_mgr, cmd, arg);

		rc = msm_isp_proc_buf_cmd(vfe_dev->buf_mgr, cmd, arg);

		mutex_unlock(&vfe_dev->realtime_mutex);

		mutex_unlock(&vfe_dev->core_mutex);

		break;

		break;

	}

	}

	case VIDIOC_MSM_ISP_REQUEST_STREAM:

	case VIDIOC_MSM_ISP_REQUEST_STREAM: