[PATCH 66/88] hwmon: (sht15) Check return value of regulator_enable()

Luis Henriques luis.henriques at canonical.com
Thu Mar 14 10:35:59 UTC 2013


3.5.7.8 -stable review patch.  If anyone has any objections, please let me know.

------------------

From: Mark Brown <broonie at opensource.wolfsonmicro.com>

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 at opensource.wolfsonmicro.com>
Signed-off-by: Guenter Roeck <linux at roeck-us.net>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
 drivers/hwmon/sht15.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
index 8b011d0..eb01802 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);
+			return ret;
+		}
+
 		/*
 		 * Setup a notifier block to update this if another device
 		 * causes the voltage to change
-- 
1.8.1.2





More information about the kernel-team mailing list