|
@@ -193,9 +193,14 @@ static int lp5521_load_program(struct lp5521_engine *eng, const u8 *pattern)
|
|
|
|
|
|
/* move current engine to direct mode and remember the state */
|
|
|
ret = lp5521_set_engine_mode(eng, LP5521_CMD_DIRECT);
|
|
|
+ if (ret)
|
|
|
+ return ret;
|
|
|
+
|
|
|
/* Mode change requires min 500 us delay. 1 - 2 ms with margin */
|
|
|
usleep_range(1000, 2000);
|
|
|
- ret |= lp5521_read(client, LP5521_REG_OP_MODE, &mode);
|
|
|
+ ret = lp5521_read(client, LP5521_REG_OP_MODE, &mode);
|
|
|
+ if (ret)
|
|
|
+ return ret;
|
|
|
|
|
|
/* For loading, all the engines to load mode */
|
|
|
lp5521_write(client, LP5521_REG_OP_MODE, LP5521_CMD_DIRECT);
|
|
@@ -211,8 +216,7 @@ static int lp5521_load_program(struct lp5521_engine *eng, const u8 *pattern)
|
|
|
LP5521_PROG_MEM_SIZE,
|
|
|
pattern);
|
|
|
|
|
|
- ret |= lp5521_write(client, LP5521_REG_OP_MODE, mode);
|
|
|
- return ret;
|
|
|
+ return lp5521_write(client, LP5521_REG_OP_MODE, mode);
|
|
|
}
|
|
|
|
|
|
static int lp5521_set_led_current(struct lp5521_chip *chip, int led, u8 curr)
|
|
@@ -785,7 +789,7 @@ 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 (buf != LP5521_REG_R_CURR_DEFAULT) {
|
|
|
+ if (ret || buf != LP5521_REG_R_CURR_DEFAULT) {
|
|
|
dev_err(&client->dev, "error in resetting chip\n");
|
|
|
goto fail2;
|
|
|
}
|