summaryrefslogtreecommitdiff
path: root/drivers/hwmon/sht15.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-02 11:33:30 +0400
committerGuenter Roeck <linux@roeck-us.net>2013-03-04 09:45:48 +0400
commit3e78080f81481aa8340374d5a37ae033c1cf4272 (patch)
tree166d853cee3d86c5022c49ba1573f8da870de0c4 /drivers/hwmon/sht15.c
parentab302bb0b87fe01f3110c1c5d5a6fca439d27c6b (diff)
downloadlinux-3e78080f81481aa8340374d5a37ae033c1cf4272.tar.xz
hwmon: (sht15) Check return value of regulator_enable()
Not having power is a pretty serious error so check that we are able to enable the supply and error out if we can't. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: stable@vger.kernel.org #3.8+; 3.0+ will need manual backport Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon/sht15.c')
-rw-r--r--drivers/hwmon/sht15.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
index bfe326e896df..2507f902fb7a 100644
--- a/drivers/hwmon/sht15.c
+++ b/drivers/hwmon/sht15.c
@@ -965,7 +965,13 @@ static int sht15_probe(struct platform_device *pdev)
if (voltage)
data->supply_uv = voltage;
- regulator_enable(data->reg);
+ ret = regulator_enable(data->reg);
+ if (ret != 0) {
+ dev_err(&pdev->dev,
+ "failed to enable regulator: %d\n", ret);
+ return ret;
+ }
+
/*
* Setup a notifier block to update this if another device
* causes the voltage to change