Commit 333e22db authored by Samu Nuutamo's avatar Samu Nuutamo Committed by Guenter Roeck

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: 4f16cab1 ("hwmon: da9052: Add support for TSI channel")
Signed-off-by: default avatarSamu Nuutamo <samu.nuutamo@vincit.fi>
[rebase to current master, reword commit message slightly]
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 7b2fd270
...@@ -244,9 +244,9 @@ static ssize_t da9052_tsi_show(struct device *dev, ...@@ -244,9 +244,9 @@ static ssize_t da9052_tsi_show(struct device *dev,
int channel = to_sensor_dev_attr(devattr)->index; int channel = to_sensor_dev_attr(devattr)->index;
int ret; int ret;
mutex_lock(&hwmon->hwmon_lock); mutex_lock(&hwmon->da9052->auxadc_lock);
ret = __da9052_read_tsi(dev, channel); ret = __da9052_read_tsi(dev, channel);
mutex_unlock(&hwmon->hwmon_lock); mutex_unlock(&hwmon->da9052->auxadc_lock);
if (ret < 0) if (ret < 0)
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment