Commit c7a78d2c authored by Jean Delvare's avatar Jean Delvare

hwmon: (sht15) Properly handle the case CONFIG_REGULATOR=n

When CONFIG_REGULATOR isn't set, regulator_get_voltage() returns 0.
Properly handle this case by not trusting the value.
Reported-by: default avatarJerome Oufella <jerome.oufella@savoirfairelinux.com>
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Cc: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@kernel.org
parent 328a2c22
...@@ -542,7 +542,12 @@ static int __devinit sht15_probe(struct platform_device *pdev) ...@@ -542,7 +542,12 @@ static int __devinit sht15_probe(struct platform_device *pdev)
/* If a regulator is available, query what the supply voltage actually is!*/ /* If a regulator is available, query what the supply voltage actually is!*/
data->reg = regulator_get(data->dev, "vcc"); data->reg = regulator_get(data->dev, "vcc");
if (!IS_ERR(data->reg)) { if (!IS_ERR(data->reg)) {
data->supply_uV = regulator_get_voltage(data->reg); int voltage;
voltage = regulator_get_voltage(data->reg);
if (voltage)
data->supply_uV = voltage;
regulator_enable(data->reg); regulator_enable(data->reg);
/* setup a notifier block to update this if another device /* setup a notifier block to update this if another device
* causes the voltage to change */ * causes the voltage to change */
......
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