media: vim2m: only cancel work if it is for right context
authorHans Verkuil <hverkuil@xs4all.nl>
Fri, 11 Jan 2019 12:07:25 +0000 (07:07 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 16 Sep 2019 06:22:02 +0000 (08:22 +0200)
commit424b75b79994c57a87e34ff1a0fd462dd3dbcb24
treef60e0b64821b29df1b07d9b70cbae01111e3dd93
parentbe77686f0369dff64d7cce4b56dcce4559421ad6
media: vim2m: only cancel work if it is for right context

[ Upstream commit 240809ef6630a4ce57c273c2d79ffb657cd361eb ]

cancel_delayed_work_sync() was called for any queue, but it should only
be called for the queue that is associated with the currently running job.

Otherwise, if two filehandles are streaming at the same time, then closing the
first will cancel the work which might still be running for a job from the
second filehandle. As a result the second filehandle will never be able to
finish the job and an attempt to stop streaming on that second filehandle will
stall.

Fixes: 52117be68b82 ("media: vim2m: use cancel_delayed_work_sync instead of flush_schedule_work")

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Cc: <stable@vger.kernel.org> # for v4.20 and up
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/media/platform/vim2m.c