From: Dominik Brodowski linux@dominikbrodowski.net
[ Upstream commit fbb3485f1f931102d8ba606f1c28123f5b48afa3 ]
We need to set TASK_INTERRUPTIBLE before calling kthread_should_stop(). Otherwise, kthread_stop() might see that the pccardd thread is still in TASK_RUNNING state and fail to wake it up.
Additionally, we only need to set the state back to TASK_RUNNING if kthread_should_stop() breaks the loop.
Cc: Greg Kroah-Hartman gregkh@linuxfoundation.org Reported-by: Al Viro viro@ZenIV.linux.org.uk Reviewed-by: Matthew Wilcox (Oracle) willy@infradead.org Fixes: d3046ba809ce ("pcmcia: fix a boot time warning in pcmcia cs code") Signed-off-by: Dominik Brodowski linux@dominikbrodowski.net Signed-off-by: Sasha Levin sashal@kernel.org --- drivers/pcmcia/cs.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c index c3b615c94b4bf..a92cbc952b70b 100644 --- a/drivers/pcmcia/cs.c +++ b/drivers/pcmcia/cs.c @@ -665,18 +665,16 @@ static int pccardd(void *__skt) if (events || sysfs_events) continue;
+ set_current_state(TASK_INTERRUPTIBLE); if (kthread_should_stop()) break;
- set_current_state(TASK_INTERRUPTIBLE); - schedule();
- /* make sure we are running */ - __set_current_state(TASK_RUNNING); - try_to_freeze(); } + /* make sure we are running before we exit */ + __set_current_state(TASK_RUNNING);
/* shut down socket, if a device is still present */ if (skt->state & SOCKET_PRESENT) {