Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney...

[karo-tx-linux.git] / drivers / leds / leds-lp5521.c

diff --git a/drivers/leds/leds-lp5521.c b/drivers/leds/leds-lp5521.c
index 966f158a07dbfa2910cf611f6726b748107f0e18..cb8a5220200b37bd10a0df71f04783175e3697d7 100644 (file)
--- a/drivers/leds/leds-lp5521.c
+++ b/drivers/leds/leds-lp5521.c
@@ -152,7 +152,7 @@ static int lp5521_read(struct i2c_client *client, u8 reg, u8 *buf)
 
        ret = i2c_smbus_read_byte_data(client, reg);
        if (ret < 0)
-               return -EIO;
+               return ret;
 
        *buf = ret;
        return 0;
@@ -616,7 +616,7 @@ static ssize_t store_led_pattern(struct device *dev,
        unsigned long val;
        int ret;
 
-       ret = strict_strtoul(buf, 16, &val);
+       ret = kstrtoul(buf, 16, &val);
        if (ret)
                return ret;
 
@@ -788,10 +788,17 @@ static int 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);