diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-02 02:33:30 -0500 |
---|---|---|
committer | Guenter Roeck <linux@roeck-us.net> | 2013-03-04 00:45:48 -0500 |
commit | 3e78080f81481aa8340374d5a37ae033c1cf4272 (patch) | |
tree | 166d853cee3d86c5022c49ba1573f8da870de0c4 /drivers/hwmon/sht15.c | |
parent | ab302bb0b87fe01f3110c1c5d5a6fca439d27c6b (diff) |
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.c | 8 |
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) | |||
965 | if (voltage) | 965 | if (voltage) |
966 | data->supply_uv = voltage; | 966 | data->supply_uv = voltage; |
967 | 967 | ||
968 | regulator_enable(data->reg); | 968 | ret = regulator_enable(data->reg); |
969 | if (ret != 0) { | ||
970 | dev_err(&pdev->dev, | ||
971 | "failed to enable regulator: %d\n", ret); | ||
972 | return ret; | ||
973 | } | ||
974 | |||
969 | /* | 975 | /* |
970 | * Setup a notifier block to update this if another device | 976 | * Setup a notifier block to update this if another device |
971 | * causes the voltage to change | 977 | * causes the voltage to change |