Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a328c29b authored by Dominik Brodowski's avatar Dominik Brodowski Committed by Greg Kroah-Hartman
Browse files

pcmcia: fix setting of kthread task states 



[ 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: default avatarAl Viro <viro@ZenIV.linux.org.uk>
Reviewed-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Fixes: d3046ba8 ("pcmcia: fix a boot time warning in pcmcia cs code")
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent f5e5b20d

drivers/pcmcia/cs.c

+3 −5
Original line number Diff line number Diff line
@@ -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) {