leds: leds-lp5521: return an error code on error in probe()

2f05e1d4 · Dan Carpenter <[email protected]> · 2012-12-02 09:29:30 -08:00

If "buf" wasn't equal to LP5521_REG_R_CURR_DEFAULT the probe fails but
we still return zero.  I've changed it to print an error message and
return -EINVAL.

Reported-by: Ben Hutchings <[email protected]>
Signed-off-by: Dan Carpenter <[email protected]>
Signed-off-by: Bryan Wu <[email protected]>

Commit: 2f05e1d4458f9cb68d4d36fb47e6830fec03c80e
Parents: 5c6f844c

Changes

1 files changed · +8 −1

File	Status	Add	Del	Content
drivers/leds/leds-lp5521.c	modified	+8	−1	View file

drivers/leds/leds-lp5521.c

View file

diff --git a/drivers/leds/leds-lp5521.c b/drivers/leds/leds-lp5521.c
index 8505afe..ddc4315 100644
--- a/drivers/leds/leds-lp5521.c
+++ b/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);