backlight: adp8860: fix another uninitialized variable use
Subsystems (3)
PATCH 1/1 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.
---
Sorry for missing this third hunk the first time around.
drivers/video/backlight/adp8860_bl.c +5 -3
@@ -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 */
Quoted 4 lines · Arnd Bergmann
A recent patch I did fixed two potential uses of uninitialized variables in the adp8870 and adp8860 drivers. Unfortunately, I missed another one:
Quoted 8 lines
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 functionThis 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 <[email protected]>
Quoted 26 lines
Fixes 6be3a5a9cd91 ("backlight: adp88x0: Fix uninitialized variable use")---
Sorry for missing this third hunk the first time around.drivers/video/backlight/adp8860_bl.c +5
-3@@ -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 */
Signature · 8 lines
Greetings, Michael -- Analog Devices GmbH Wilhelm-Wagenfeld-Str. 6 80807 Muenchen Sitz der Gesellschaft: Muenchen; Registergericht: Muenchen HRB 40368; Geschaeftsfuehrer:Dr.Carsten Suckrow, Thomas Wessel, William A. Martin, Margaret Seif
Quoted 9 lines · Michael Hennerich
Quoted 6 lines · Arnd Bergmann
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 thisfunction
Quoted 1 line
Quoted 7 lines
Quoted 5 lines
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 <[email protected]>
Best regards,
Jingoo Han
Quoted 38 lines
Quoted 17 lines
Fixes 6be3a5a9cd91 ("backlight: adp88x0: Fix uninitialized variable use")---
Sorry for missing this third hunk the first time around.drivers/video/backlight/adp8860_bl.c +1
-2@@ -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) {drivers/video/backlight/adp8860_bl.c static ssize_t adp8860_bl_ambient_light_level_show(struct device *dev, · line 578
Quoted 10 lines
drivers/video/backlight/adp8860_bl.c +4
-1+ 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 */ --
Greetings,
Michael--
Analog Devices GmbH Wilhelm-Wagenfeld-Str. 6 80807 Muenchen
Sitz der Gesellschaft: Muenchen; Registergericht: Muenchen HRB 40368; Geschaeftsfuehrer:Dr.Carsten Suckrow, Thomas Wessel, William A. Martin, Margaret Seif
Quoted 7 lines · Arnd Bergmann
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
Quoted 8 lines
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 <[email protected]>Fixes 6be3a5a9cd91 ("backlight: adp88x0: Fix uninitialized variable use")---
Sorry for missing this third hunk the first time around.
Where's your diff?
Applied anyway, thanks.
Quoted 22 lines
drivers/video/backlight/adp8860_bl.c +5
-3@@ -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 */
Signature · 4 lines
Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org ? Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog