diff options
author | Hans Verkuil <hverkuil-cisco@xs4all.nl> | 2020-07-13 13:30:48 +0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-08-28 15:06:17 +0200 |
commit | 2dc73489ae84f784448422a31f51501e520b073a (patch) | |
tree | 0a457e6cee1388ab5cc6303790ed78c7aeae2e0b /drivers/staging/media/meson | |
parent | bda24f433013d698467dea589e0fe37544c44fe0 (diff) | |
download | linux-stable-2dc73489ae84f784448422a31f51501e520b073a.tar.gz linux-stable-2dc73489ae84f784448422a31f51501e520b073a.tar.bz2 linux-stable-2dc73489ae84f784448422a31f51501e520b073a.zip |
media: staging/media: drop vb2_queue_release()
This is only needed for drivers that do not use vb2_fop_release().
Note that vb2_queue_release() is *not* the counterpart of vb2_queue_init()
as some drivers here seem to think.
Also use vb2_video_unregister_device() to automatically stop streaming
at unregister time for those drivers that set vdev->queue.
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'drivers/staging/media/meson')
-rw-r--r-- | drivers/staging/media/meson/vdec/vdec.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/staging/media/meson/vdec/vdec.c b/drivers/staging/media/meson/vdec/vdec.c index 3040136ceb77..5ccb3846c879 100644 --- a/drivers/staging/media/meson/vdec/vdec.c +++ b/drivers/staging/media/meson/vdec/vdec.c @@ -841,13 +841,7 @@ static int m2m_queue_init(void *priv, struct vb2_queue *src_vq, dst_vq->min_buffers_needed = 1; dst_vq->dev = sess->core->dev; dst_vq->lock = &sess->lock; - ret = vb2_queue_init(dst_vq); - if (ret) { - vb2_queue_release(src_vq); - return ret; - } - - return 0; + return vb2_queue_init(dst_vq); } static int vdec_init_ctrls(struct amvdec_session *sess) |