| From c7a78d2c2e2537fd24903e966f34aae50319d587 Mon Sep 17 00:00:00 2001 |
| From: Jean Delvare <khali@linux-fr.org> |
| Date: Wed, 14 Apr 2010 16:14:08 +0200 |
| Subject: hwmon: (sht15) Properly handle the case CONFIG_REGULATOR=n |
| |
| From: Jean Delvare <khali@linux-fr.org> |
| |
| commit c7a78d2c2e2537fd24903e966f34aae50319d587 upstream. |
| |
| When CONFIG_REGULATOR isn't set, regulator_get_voltage() returns 0. |
| Properly handle this case by not trusting the value. |
| |
| Reported-by: Jerome Oufella <jerome.oufella@savoirfairelinux.com> |
| Signed-off-by: Jean Delvare <khali@linux-fr.org> |
| Cc: Jonathan Cameron <jic23@cam.ac.uk> |
| Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/hwmon/sht15.c | 7 ++++++- |
| 1 file changed, 6 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/hwmon/sht15.c |
| +++ b/drivers/hwmon/sht15.c |
| @@ -541,7 +541,12 @@ static int __devinit sht15_probe(struct |
| /* If a regulator is available, query what the supply voltage actually is!*/ |
| data->reg = regulator_get(data->dev, "vcc"); |
| 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); |
| /* setup a notifier block to update this if another device |
| * causes the voltage to change */ |