aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/vimc
diff options
context:
space:
mode:
authorHelen Fornazier <helen.koike@collabora.com>2019-03-06 17:42:38 -0500
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2019-03-19 15:27:22 -0400
commit2978a505aaa981b279ef359f74ba93d25098e0a0 (patch)
tree8a6dbce7956bb9fcfc7cedf8a4483ccd603096ed /drivers/media/platform/vimc
parentmedia: vimc: deb: fix default sink bayer format (diff)
downloadlinux-dev-2978a505aaa981b279ef359f74ba93d25098e0a0.tar.xz
linux-dev-2978a505aaa981b279ef359f74ba93d25098e0a0.zip
media: vimc: stream: fix thread state before sleep
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>
Diffstat (limited to 'drivers/media/platform/vimc')
-rw-r--r--drivers/media/platform/vimc/vimc-streamer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/vimc/vimc-streamer.c b/drivers/media/platform/vimc/vimc-streamer.c
index fcc897fb247b..392754c18046 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);
}