diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-11-30 12:24:23 +0100 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2016-01-11 07:58:43 +0000 |
| commit | 02f22c004ff2ab0ce1f2fa3cc6a87cf20a4fed40 (patch) | |
| tree | 79a240d3d51df13902085902045cb852e4500684 /drivers/video/backlight | |
| parent | 2f4647a149943b1f87e46858e9f13e02010347f7 (diff) | |
| download | linux-stable-02f22c004ff2ab0ce1f2fa3cc6a87cf20a4fed40.tar.gz linux-stable-02f22c004ff2ab0ce1f2fa3cc6a87cf20a4fed40.tar.bz2 linux-stable-02f22c004ff2ab0ce1f2fa3cc6a87cf20a4fed40.zip | |
backlight: adp8860: Fix another uninitialized variable use
A recent patch I did fixed two potential uses of uninitialized
variables in the adp8870 and adp8860 drivers. Unfortunately,
I missed another one:
drivers/video/backlight/adp8860_bl.c: In function 'adp8860_bl_ambient_light_level_show':
drivers/video/backlight/adp8860_bl.c:570:11: warning: 'reg_val' may be used uninitialized in this function
This does the same change as before in one additional function,
and also changes the check for the return value in a way that
avoids another false positive warning with a similar message.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 6be3a5a9cd91 ("backlight: adp88x0: Fix uninitialized variable use")
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jingoo Han <jingoohan1@gmail.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/video/backlight')
| -rw-r--r-- | drivers/video/backlight/adp8860_bl.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/video/backlight/adp8860_bl.c b/drivers/video/backlight/adp8860_bl.c index f0d4c0324580..510e559c060e 100644 --- a/drivers/video/backlight/adp8860_bl.c +++ b/drivers/video/backlight/adp8860_bl.c @@ -566,11 +566,13 @@ static ssize_t adp8860_bl_ambient_light_level_show(struct device *dev, mutex_lock(&data->lock); error = adp8860_read(data->client, ADP8860_PH1LEVL, ®_val); - ret_val = reg_val; - error |= adp8860_read(data->client, ADP8860_PH1LEVH, ®_val); + if (!error) { + ret_val = reg_val; + error = adp8860_read(data->client, ADP8860_PH1LEVH, ®_val); + } mutex_unlock(&data->lock); - if (error < 0) + if (error) return error; /* Return 13-bit conversion value for the first light sensor */ |