Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

backlight: adp88x0: Fix uninitialized variable use

gcc correctly warns about both the adp8860 and adp8870 backlight
drivers using an uninitialized variable in their error handling
path:

drivers/video/backlight/adp8870_bl.c: In function 'adp8870_bl_ambient_light_zone_store':
drivers/video/backlight/adp8870_bl.c:811:11: warning: 'reg_val' may be used uninitialized in this function

This changes the code to only write back the data if it was
correctly read to start with.

As a side-note, the drivers are mostly identical, so I think they
should really be merged into one file to avoid having to fix every
bug twice.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

authored by

Arnd Bergmann and committed by
Lee Jones
86c68e2f 1ec21837

+12 -8
+6 -4
drivers/video/backlight/adp8860_bl.c
··· 621 621 622 622 /* Set user supplied ambient light zone */ 623 623 mutex_lock(&data->lock); 624 - adp8860_read(data->client, ADP8860_CFGR, &reg_val); 625 - reg_val &= ~(CFGR_BLV_MASK << CFGR_BLV_SHIFT); 626 - reg_val |= (val - 1) << CFGR_BLV_SHIFT; 627 - adp8860_write(data->client, ADP8860_CFGR, reg_val); 624 + ret = adp8860_read(data->client, ADP8860_CFGR, &reg_val); 625 + if (!ret) { 626 + reg_val &= ~(CFGR_BLV_MASK << CFGR_BLV_SHIFT); 627 + reg_val |= (val - 1) << CFGR_BLV_SHIFT; 628 + adp8860_write(data->client, ADP8860_CFGR, reg_val); 629 + } 628 630 mutex_unlock(&data->lock); 629 631 } 630 632
+6 -4
drivers/video/backlight/adp8870_bl.c
··· 807 807 808 808 /* Set user supplied ambient light zone */ 809 809 mutex_lock(&data->lock); 810 - adp8870_read(data->client, ADP8870_CFGR, &reg_val); 811 - reg_val &= ~(CFGR_BLV_MASK << CFGR_BLV_SHIFT); 812 - reg_val |= (val - 1) << CFGR_BLV_SHIFT; 813 - adp8870_write(data->client, ADP8870_CFGR, reg_val); 810 + ret = adp8870_read(data->client, ADP8870_CFGR, &reg_val); 811 + if (!ret) { 812 + reg_val &= ~(CFGR_BLV_MASK << CFGR_BLV_SHIFT); 813 + reg_val |= (val - 1) << CFGR_BLV_SHIFT; 814 + adp8870_write(data->client, ADP8870_CFGR, reg_val); 815 + } 814 816 mutex_unlock(&data->lock); 815 817 } 816 818