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

Commit df3ea6cc authored by Armin Wolf's avatar Armin Wolf Committed by Greg Kroah-Hartman
Browse files

hwmon: (adt7470) Fix warning on module removal 



commit 7b2666ce445c700b8dcee994da44ddcf050a0842 upstream.

When removing the adt7470 module, a warning might be printed:

do not call blocking ops when !TASK_RUNNING; state=1
set at [<ffffffffa006052b>] adt7470_update_thread+0x7b/0x130 [adt7470]

This happens because adt7470_update_thread() can leave the kthread in
TASK_INTERRUPTIBLE state when the kthread is being stopped before
the call of set_current_state(). Since kthread_exit() might sleep in
exit_signals(), the warning is printed.
Fix that by using schedule_timeout_interruptible() and removing
the call of set_current_state().
This causes TASK_INTERRUPTIBLE to be set after kthread_should_stop()
which might cause the kthread to exit.

Reported-by: default avatarZheyu Ma <zheyuma97@gmail.com>
Fixes: 93cacfd4 (hwmon: (adt7470) Allow faster removal)
Signed-off-by: default avatarArmin Wolf <W_Armin@gmx.de>
Tested-by: default avatarZheyu Ma <zheyuma97@gmail.com>
Link: https://lore.kernel.org/r/20220407101312.13331-1-W_Armin@gmx.de


Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 01d4363d

drivers/hwmon/adt7470.c

+2 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/kthread.h>

#include <linux/slab.h>

#include <linux/util_macros.h>

#include <linux/sched.h>



/* Addresses to scan */

static const unsigned short normal_i2c[] = { 0x2C, 0x2E, 0x2F, I2C_CLIENT_END };
@@ -260,11 +261,10 @@ static int adt7470_update_thread(void *p) 
		adt7470_read_temperatures(client, data);

		mutex_unlock(&data->lock);



		set_current_state(TASK_INTERRUPTIBLE);

		if (kthread_should_stop())

			break;



		schedule_timeout(msecs_to_jiffies(data->auto_update_interval));

		schedule_timeout_interruptible(msecs_to_jiffies(data->auto_update_interval));

	}



	return 0;