summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorSamu Nuutamo <samu.nuutamo@vincit.fi>2020-05-11 13:02:19 +0200
committerGuenter Roeck <linux@roeck-us.net>2020-05-13 10:06:09 -0700
commit333e22db228f0bd0c839553015a6a8d3db4ba569 (patch)
treec2265df6f21223ca9c3a9e968cb9300e42fd2e95 /drivers
parent7b2fd270af27edaf02acb41a7babe805a9441914 (diff)
downloadlinux-sh-333e22db228f0bd0c839553015a6a8d3db4ba569.tar.gz
hwmon: (da9052) Synchronize access with mfd
When tsi-as-adc is configured it is possible for in7[0123]_input read to return an incorrect value if a concurrent read to in[456]_input is performed. This is caused by a concurrent manipulation of the mux channel without proper locking as hwmon and mfd use different locks for synchronization. Switch hwmon to use the same lock as mfd when accessing the TSI channel. Fixes: 4f16cab19a3d5 ("hwmon: da9052: Add support for TSI channel") Signed-off-by: Samu Nuutamo <samu.nuutamo@vincit.fi> [rebase to current master, reword commit message slightly] Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hwmon/da9052-hwmon.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwmon/da9052-hwmon.c b/drivers/hwmon/da9052-hwmon.c
index 53b517dbe7e6..4af2fc309c28 100644
--- a/drivers/hwmon/da9052-hwmon.c
+++ b/drivers/hwmon/da9052-hwmon.c
@@ -244,9 +244,9 @@ static ssize_t da9052_tsi_show(struct device *dev,
int channel = to_sensor_dev_attr(devattr)->index;
int ret;
- mutex_lock(&hwmon->hwmon_lock);
+ mutex_lock(&hwmon->da9052->auxadc_lock);
ret = __da9052_read_tsi(dev, channel);
- mutex_unlock(&hwmon->hwmon_lock);
+ mutex_unlock(&hwmon->da9052->auxadc_lock);
if (ret < 0)
return ret;