From 84c40e8fb93827b44b1e12ef21dc11e98c47f570 Mon Sep 17 00:00:00 2001 From: Suprith Malligere Shankaregowda Date: Mon, 7 May 2018 14:30:20 +0530 Subject: [PATCH] msm:ais: Remove recursive locks We are trying to acquire the same mutex lock twice in iotcl path and axi/stats start stream. Removed recursive locks. Change-Id: I331f79e5a387aa64600656f6377ba46385d11a83 Signed-off-by: Suprith Malligere Shankaregowda --- drivers/media/platform/msm/ais/isp/msm_isp_util.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/media/platform/msm/ais/isp/msm_isp_util.c b/drivers/media/platform/msm/ais/isp/msm_isp_util.c index e4e368424007..2ba19b13535b 100644 --- a/drivers/media/platform/msm/ais/isp/msm_isp_util.c +++ b/drivers/media/platform/msm/ais/isp/msm_isp_util.c @@ -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: