openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

media: vimc: streamer: if kthread_stop fails, ignore the error 

Ignore errors returned from kthread_stop since the
vimc subdevices should still be notified that
streaming stopped so they can release the memory for
the streaming, and also kthread should be set to NULL.
kthread_stop can return -EINTR in case the thread
did not yet run. This can happen if userspace calls
streamon and streamoff right after.

Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
Acked-by: Helen Koike <helen.koike@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Dafna Hirschfeld 2020-01-22 10:52:51 +01:00 committed by Mauro Carvalho Chehab
parent 3eed7385bf
commit 8b9f91751b
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/media/platform/vimc/vimc-streamer.c
View File

@ -220,8 +220,14 @@ int vimc_streamer_s_stream(struct vimc_stream *stream,
return 0; return 0;
ret = kthread_stop(stream->kthread); ret = kthread_stop(stream->kthread);
/*
* kthread_stop returns -EINTR in cases when streamon was
* immediately followed by streamoff, and the thread didn't had
* a chance to run. Ignore errors to stop the stream in the
* pipeline.
*/
if (ret) if (ret)
return ret; dev_dbg(ved->dev, "kthread_stop returned '%d'\n", ret);
stream->kthread = NULL; stream->kthread = NULL;