Merge tag 'remoteproc-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad...

[~andy/linux] / drivers / video / backlight / adp8860_bl.c

diff --git a/drivers/video/backlight/adp8860_bl.c b/drivers/video/backlight/adp8860_bl.c
index 6bb7f3644b3d4324370ba6aaab14e70296441818..75b10f8761276a889bde8be038e23212f8730eba 100644 (file)
--- a/drivers/video/backlight/adp8860_bl.c
+++ b/drivers/video/backlight/adp8860_bl.c
@@ -249,12 +249,14 @@ static int adp8860_led_probe(struct i2c_client *client)
                if (led_dat->id > 7 || led_dat->id < 1) {
                        dev_err(&client->dev, "Invalid LED ID %d\n",
                                led_dat->id);
+                       ret = -EINVAL;
                        goto err;
                }
 
                if (pdata->bl_led_assign & (1 << (led_dat->id - 1))) {
                        dev_err(&client->dev, "LED %d used by Backlight\n",
                                led_dat->id);
+                       ret = -EBUSY;
                        goto err;
                }