diff options
| author | Alexey Khoroshilov <khoroshilov@ispras.ru> | 2016-07-09 01:19:51 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-11-21 09:01:06 +0100 |
| commit | c141816f72880d3bf2b0b2f86935986348da39d2 (patch) | |
| tree | cc2798956555fb6f62b5e40b0ab6eb58e7a2960f | |
| parent | 7f213c377aaf7f36f0d523446a985462291cc474 (diff) | |
| download | linux-stable-c141816f72880d3bf2b0b2f86935986348da39d2.tar.gz linux-stable-c141816f72880d3bf2b0b2f86935986348da39d2.tar.bz2 linux-stable-c141816f72880d3bf2b0b2f86935986348da39d2.zip | |
backlight: adp5520: Fix error handling in adp5520_bl_probe()
[ Upstream commit 0eb3fba8c68275f0122f65f7316efaaf86448016 ]
If adp5520_bl_setup() fails, sysfs group left unremoved.
By the way, fix overcomplicated assignement of error code.
Found by Linux Driver Verification project (linuxtesting.org).
Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/video/backlight/adp5520_bl.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/video/backlight/adp5520_bl.c b/drivers/video/backlight/adp5520_bl.c index dd88ba1d71ce..35373e2065b2 100644 --- a/drivers/video/backlight/adp5520_bl.c +++ b/drivers/video/backlight/adp5520_bl.c @@ -332,10 +332,18 @@ static int adp5520_bl_probe(struct platform_device *pdev) } platform_set_drvdata(pdev, bl); - ret |= adp5520_bl_setup(bl); + ret = adp5520_bl_setup(bl); + if (ret) { + dev_err(&pdev->dev, "failed to setup\n"); + if (data->pdata->en_ambl_sens) + sysfs_remove_group(&bl->dev.kobj, + &adp5520_bl_attr_group); + return ret; + } + backlight_update_status(bl); - return ret; + return 0; } static int adp5520_bl_remove(struct platform_device *pdev) |