From 4b351408c460c3dd4129da58e55f691120aa5f9a Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Sun, 2 Dec 2012 09:29:30 -0800
Subject: [PATCH] --- yaml --- r: 344497 b: refs/heads/master c:
 2f05e1d4458f9cb68d4d36fb47e6830fec03c80e h: refs/heads/master i:   344495:
 66a36e7c16b7754ffdb058ddf946f6906d1c539a v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/leds/leds-lp5521.c | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 246d66545c6b..ab75b0e006ea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c6f844cee2139182b3a778f2a883a77e5bb8f7d
+refs/heads/master: 2f05e1d4458f9cb68d4d36fb47e6830fec03c80e
diff --git a/trunk/drivers/leds/leds-lp5521.c b/trunk/drivers/leds/leds-lp5521.c
index 8505afe4b52e..ddc431529157 100644
--- a/trunk/drivers/leds/leds-lp5521.c
+++ b/trunk/drivers/leds/leds-lp5521.c
@@ -788,10 +788,17 @@ static int __devinit lp5521_probe(struct i2c_client *client,
 	 * LP5521_REG_ENABLE register will not have any effect - strange!
 	 */
 	ret = lp5521_read(client, LP5521_REG_R_CURRENT, &buf);
-	if (ret || buf != LP5521_REG_R_CURR_DEFAULT) {
+	if (ret) {
 		dev_err(&client->dev, "error in resetting chip\n");
 		goto fail2;
 	}
+	if (buf != LP5521_REG_R_CURR_DEFAULT) {
+		dev_err(&client->dev,
+			"unexpected data in register (expected 0x%x got 0x%x)\n",
+			LP5521_REG_R_CURR_DEFAULT, buf);
+		ret = -EINVAL;
+		goto fail2;
+	}
 	usleep_range(10000, 20000);
 
 	ret = lp5521_detect(client);