| From d06a45a73e14fc7f004c94df694a5f5909f295d6 Mon Sep 17 00:00:00 2001 |
| From: Helen Fornazier <helen.koike@collabora.com> |
| Date: Wed, 6 Mar 2019 17:42:38 -0500 |
| Subject: media: vimc: stream: fix thread state before sleep |
| |
| [ Upstream commit 2978a505aaa981b279ef359f74ba93d25098e0a0 ] |
| |
| The state TASK_UNINTERRUPTIBLE should be set just before |
| schedule_timeout() call, so it knows the sleep mode it should enter. |
| There is no point in setting TASK_UNINTERRUPTIBLE at the initialization |
| of the thread as schedule_timeout() will set the state back to |
| TASK_RUNNING. |
| |
| This fixes a warning in __might_sleep() call, as it's expecting the |
| task to be in TASK_RUNNING state just before changing the state to |
| a sleeping state. |
| |
| Reported-by: Hans Verkuil <hverkuil@xs4all.nl> |
| Signed-off-by: Helen Koike <helen.koike@collabora.com> |
| Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/media/platform/vimc/vimc-streamer.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/media/platform/vimc/vimc-streamer.c b/drivers/media/platform/vimc/vimc-streamer.c |
| index fcc897fb247bc..392754c18046c 100644 |
| --- a/drivers/media/platform/vimc/vimc-streamer.c |
| +++ b/drivers/media/platform/vimc/vimc-streamer.c |
| @@ -120,7 +120,6 @@ static int vimc_streamer_thread(void *data) |
| int i; |
| |
| set_freezable(); |
| - set_current_state(TASK_UNINTERRUPTIBLE); |
| |
| for (;;) { |
| try_to_freeze(); |
| @@ -137,6 +136,7 @@ static int vimc_streamer_thread(void *data) |
| break; |
| } |
| //wait for 60hz |
| + set_current_state(TASK_UNINTERRUPTIBLE); |
| schedule_timeout(HZ / 60); |
| } |
| |
| -- |
| 2.20.1 |
| |
