diff options
author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-04-29 19:17:53 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-29 21:28:17 -0400 |
commit | 84eba9ed709198cda09c14a16c499a45d88a63ea (patch) | |
tree | a1d2ed6053bbaa4c1159a1ad196116de6fd95290 /drivers/video/backlight | |
parent | 6a7aeb1ae8d8b15073f730ad7828c4b53f1402c3 (diff) |
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>
Diffstat (limited to 'drivers/video/backlight')
-rw-r--r-- | drivers/video/backlight/adp8860_bl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/backlight/adp8860_bl.c b/drivers/video/backlight/adp8860_bl.c index 6bb7f3644b3d..75b10f876127 100644 --- 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) | |||
249 | if (led_dat->id > 7 || led_dat->id < 1) { | 249 | if (led_dat->id > 7 || led_dat->id < 1) { |
250 | dev_err(&client->dev, "Invalid LED ID %d\n", | 250 | dev_err(&client->dev, "Invalid LED ID %d\n", |
251 | led_dat->id); | 251 | led_dat->id); |
252 | ret = -EINVAL; | ||
252 | goto err; | 253 | goto err; |
253 | } | 254 | } |
254 | 255 | ||
255 | if (pdata->bl_led_assign & (1 << (led_dat->id - 1))) { | 256 | if (pdata->bl_led_assign & (1 << (led_dat->id - 1))) { |
256 | dev_err(&client->dev, "LED %d used by Backlight\n", | 257 | dev_err(&client->dev, "LED %d used by Backlight\n", |
257 | led_dat->id); | 258 | led_dat->id); |
259 | ret = -EBUSY; | ||
258 | goto err; | 260 | goto err; |
259 | } | 261 | } |
260 | 262 | ||