summaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/sunxi
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil-cisco@xs4all.nl>2020-07-07 15:36:47 +0200
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>2020-07-19 07:45:55 +0200
commit503ebad4b5d7883ab8476d95f0e2aa77bc56f91e (patch)
tree6bd13d8f8682793fe41281fb13465bf4c4450204 /drivers/media/platform/sunxi
parent71ecc5356d227072c7c31e44f6774d461fd4865f (diff)
downloadlinux-503ebad4b5d7883ab8476d95f0e2aa77bc56f91e.tar.bz2
sun4i-csi: call _vb2_fop_release instead of v4l2_fh_release
This driver didn't call _vb2_fop_release in the sun4i_csi_release function. Without that call the vb2 queue is not properly canceled and buffers may not be freed. Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Acked-by: Maxime Ripard <mripard@kernel.org> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'drivers/media/platform/sunxi')
-rw-r--r--drivers/media/platform/sunxi/sun4i-csi/sun4i_v4l2.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/platform/sunxi/sun4i-csi/sun4i_v4l2.c b/drivers/media/platform/sunxi/sun4i-csi/sun4i_v4l2.c
index 06bf0d170904..8f4e254b6a41 100644
--- a/drivers/media/platform/sunxi/sun4i-csi/sun4i_v4l2.c
+++ b/drivers/media/platform/sunxi/sun4i-csi/sun4i_v4l2.c
@@ -242,7 +242,8 @@ static int sun4i_csi_release(struct file *file)
mutex_lock(&csi->lock);
- v4l2_fh_release(file);
+ _vb2_fop_release(file, NULL);
+
v4l2_pipeline_pm_put(&csi->vdev.entity);
pm_runtime_put(csi->dev);