diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-02 15:33:30 +0800 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2013-03-20 15:03:22 +0000 |
| commit | 87c7f521968a1491af48d34a4ea6566485e6426c (patch) | |
| tree | 03ee9e23c9d02a8b57f5a055858c9ae35f9f32b1 /drivers/hwmon/sht15.c | |
| parent | df2f41aa5ec3857956ea6c6c77049101c06eebba (diff) | |
| download | kernel_samsung_smdk4412-87c7f521968a1491af48d34a4ea6566485e6426c.zip kernel_samsung_smdk4412-87c7f521968a1491af48d34a4ea6566485e6426c.tar.gz kernel_samsung_smdk4412-87c7f521968a1491af48d34a4ea6566485e6426c.tar.bz2 | |
hwmon: (sht15) Check return value of regulator_enable()
commit 3e78080f81481aa8340374d5a37ae033c1cf4272 upstream.
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>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
[bwh: Backported to 3.2: driver does not use the devm API to manage
memory, so goto err_free_data rather than returning on error]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
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 5357925..3e3153e 100644 --- a/drivers/hwmon/sht15.c +++ b/drivers/hwmon/sht15.c @@ -926,7 +926,13 @@ static int __devinit 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); + goto err_free_data; + } + /* * Setup a notifier block to update this if another device * causes the voltage to change |