Skip to content

Commit 9fee7d1

Browse files
tq-steinagroeck
authored andcommitted
hwmon: (gpio-fan) Add missing mutex locks
set_fan_speed() is expected to be called with fan_data->lock being locked. Add locking for proper synchronization. Signed-off-by: Alexander Stein <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Guenter Roeck <[email protected]>
1 parent 9f8e2e4 commit 9fee7d1

File tree

1 file changed

+15
-1
lines changed

1 file changed

+15
-1
lines changed

drivers/hwmon/gpio-fan.c

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,12 @@ static int gpio_fan_set_cur_state(struct thermal_cooling_device *cdev,
393393
if (state >= fan_data->num_speed)
394394
return -EINVAL;
395395

396+
mutex_lock(&fan_data->lock);
397+
396398
set_fan_speed(fan_data, state);
399+
400+
mutex_unlock(&fan_data->lock);
401+
397402
return 0;
398403
}
399404

@@ -489,7 +494,11 @@ MODULE_DEVICE_TABLE(of, of_gpio_fan_match);
489494

490495
static void gpio_fan_stop(void *data)
491496
{
497+
struct gpio_fan_data *fan_data = data;
498+
499+
mutex_lock(&fan_data->lock);
492500
set_fan_speed(data, 0);
501+
mutex_unlock(&fan_data->lock);
493502
}
494503

495504
static int gpio_fan_probe(struct platform_device *pdev)
@@ -562,7 +571,9 @@ static int gpio_fan_suspend(struct device *dev)
562571

563572
if (fan_data->gpios) {
564573
fan_data->resume_speed = fan_data->speed_index;
574+
mutex_lock(&fan_data->lock);
565575
set_fan_speed(fan_data, 0);
576+
mutex_unlock(&fan_data->lock);
566577
}
567578

568579
return 0;
@@ -572,8 +583,11 @@ static int gpio_fan_resume(struct device *dev)
572583
{
573584
struct gpio_fan_data *fan_data = dev_get_drvdata(dev);
574585

575-
if (fan_data->gpios)
586+
if (fan_data->gpios) {
587+
mutex_lock(&fan_data->lock);
576588
set_fan_speed(fan_data, fan_data->resume_speed);
589+
mutex_unlock(&fan_data->lock);
590+
}
577591

578592
return 0;
579593
}

0 commit comments

Comments
 (0)