Commit 84eba9ed authored Apr 29, 2013 by Wei Yongjun Committed by Linus Torvalds Apr 29, 2013

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: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 6a7aeb1a

drivers/video/backlight/adp8860_bl.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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;
		}