OSDN Git Service

media: vimc: stream: fix thread state before sleep
authorHelen Fornazier <helen.koike@collabora.com>
Wed, 6 Mar 2019 22:42:38 +0000 (17:42 -0500)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Tue, 19 Mar 2019 19:27:22 +0000 (15:27 -0400)
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>
drivers/media/platform/vimc/vimc-streamer.c

index fcc897f..392754c 100644 (file)
@@ -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);
        }