]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
hwmon: (gpio-fan) Add missing mutex locks
authorAlexander Stein <alexander.stein@ew.tq-group.com>
Mon, 10 Feb 2025 14:59:30 +0000 (15:59 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 4 Jun 2025 12:40:10 +0000 (14:40 +0200)
[ Upstream commit 9fee7d19bab635f89223cc40dfd2c8797fdc4988 ]

set_fan_speed() is expected to be called with fan_data->lock being locked.
Add locking for proper synchronization.

Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
Link: https://lore.kernel.org/r/20250210145934.761280-3-alexander.stein@ew.tq-group.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/hwmon/gpio-fan.c

index ba408942dbe73bfa1fefa3f1bb1863c4dac8e2db..f1926b9171e0c9bc1fc1b6b172555c50ad46bb5b 100644 (file)
@@ -392,7 +392,12 @@ static int gpio_fan_set_cur_state(struct thermal_cooling_device *cdev,
        if (state >= fan_data->num_speed)
                return -EINVAL;
 
+       mutex_lock(&fan_data->lock);
+
        set_fan_speed(fan_data, state);
+
+       mutex_unlock(&fan_data->lock);
+
        return 0;
 }
 
@@ -488,7 +493,11 @@ MODULE_DEVICE_TABLE(of, of_gpio_fan_match);
 
 static void gpio_fan_stop(void *data)
 {
+       struct gpio_fan_data *fan_data = data;
+
+       mutex_lock(&fan_data->lock);
        set_fan_speed(data, 0);
+       mutex_unlock(&fan_data->lock);
 }
 
 static int gpio_fan_probe(struct platform_device *pdev)
@@ -561,7 +570,9 @@ static int gpio_fan_suspend(struct device *dev)
 
        if (fan_data->gpios) {
                fan_data->resume_speed = fan_data->speed_index;
+               mutex_lock(&fan_data->lock);
                set_fan_speed(fan_data, 0);
+               mutex_unlock(&fan_data->lock);
        }
 
        return 0;
@@ -571,8 +582,11 @@ static int gpio_fan_resume(struct device *dev)
 {
        struct gpio_fan_data *fan_data = dev_get_drvdata(dev);
 
-       if (fan_data->gpios)
+       if (fan_data->gpios) {
+               mutex_lock(&fan_data->lock);
                set_fan_speed(fan_data, fan_data->resume_speed);
+               mutex_unlock(&fan_data->lock);
+       }
 
        return 0;
 }