mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
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>
This commit is contained in:
parent
2f4647a149
commit
02f22c004f
1 changed files with 5 additions and 3 deletions
|
@ -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 */
|
||||
|
|
Loading…
Reference in a new issue