media: exynos4-is: Fix recursive locking in isp_video_release()
diff mbox series

Message ID 1571394052-24446-1-git-send-email-sw0312.kim@samsung.com
State Not Applicable
Headers show
Series
  • media: exynos4-is: Fix recursive locking in isp_video_release()
Related show

Commit Message

Seung-Woo Kim Oct. 18, 2019, 10:20 a.m. UTC
From isp_video_release(), &isp->video_lock is held and subsequent
vb2_fop_release() tries to lock vdev->lock which is same with the
previous one. Replace vb2_fop_release() with _vb2_fop_release() to
fix the recursive locking.

Fixes: 1380f5754cb0 ("[media] videobuf2: Add missing lock held on vb2_fop_release")
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
---
 drivers/media/platform/exynos4-is/fimc-isp-video.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Comments

Sylwester Nawrocki Oct. 18, 2019, 10:32 a.m. UTC | #1
On 10/18/19 12:20, Seung-Woo Kim wrote:
>>From isp_video_release(), &isp->video_lock is held and subsequent
> vb2_fop_release() tries to lock vdev->lock which is same with the
> previous one. Replace vb2_fop_release() with _vb2_fop_release() to
> fix the recursive locking.
> 
> Fixes: 1380f5754cb0 ("[media] videobuf2: Add missing lock held on vb2_fop_release")
> Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>

Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com>

Patch
diff mbox series

diff --git a/drivers/media/platform/exynos4-is/fimc-isp-video.c b/drivers/media/platform/exynos4-is/fimc-isp-video.c
index 378cc30..d2cbcdc 100644
--- a/drivers/media/platform/exynos4-is/fimc-isp-video.c
+++ b/drivers/media/platform/exynos4-is/fimc-isp-video.c
@@ -313,7 +313,7 @@  static int isp_video_release(struct file *file)
 		ivc->streaming = 0;
 	}
 
-	vb2_fop_release(file);
+	_vb2_fop_release(file, NULL);
 
 	if (v4l2_fh_is_singular_file(file)) {
 		fimc_pipeline_call(&ivc->ve, close);