From 51d15a202cb8a14e1c3f3d23fdf7555a02c185d5 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sat, 2 Mar 2013 15:33:30 +0800
Subject: [PATCH] --- yaml --- r: 360848 b: refs/heads/master c:
 3e78080f81481aa8340374d5a37ae033c1cf4272 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/hwmon/sht15.c | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f9db9334670d..1cc846063ae0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab302bb0b87fe01f3110c1c5d5a6fca439d27c6b
+refs/heads/master: 3e78080f81481aa8340374d5a37ae033c1cf4272
diff --git a/trunk/drivers/hwmon/sht15.c b/trunk/drivers/hwmon/sht15.c
index bfe326e896df..2507f902fb7a 100644
--- a/trunk/drivers/hwmon/sht15.c
+++ b/trunk/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