Commit 84eba9ed authored by Wei Yongjun's avatar Wei Yongjun Committed by Linus Torvalds

drivers/video/backlight/adp8860_bl.c: fix error return code in adp8860_led_probe()

Fix to return a negative error code from the error handling case instead
of zero, as returned elsewhere in this function.
Signed-off-by: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: default avatarJingoo Han <jg1.han@samsung.com>
Acked-by: default avatarMichael Hennerich <michael.hennerich@analog.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6a7aeb1a
...@@ -249,12 +249,14 @@ static int adp8860_led_probe(struct i2c_client *client) ...@@ -249,12 +249,14 @@ static int adp8860_led_probe(struct i2c_client *client)
if (led_dat->id > 7 || led_dat->id < 1) { if (led_dat->id > 7 || led_dat->id < 1) {
dev_err(&client->dev, "Invalid LED ID %d\n", dev_err(&client->dev, "Invalid LED ID %d\n",
led_dat->id); led_dat->id);
ret = -EINVAL;
goto err; goto err;
} }
if (pdata->bl_led_assign & (1 << (led_dat->id - 1))) { if (pdata->bl_led_assign & (1 << (led_dat->id - 1))) {
dev_err(&client->dev, "LED %d used by Backlight\n", dev_err(&client->dev, "LED %d used by Backlight\n",
led_dat->id); led_dat->id);
ret = -EBUSY;
goto err; goto err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment