Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02f22c00 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Lee Jones
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
Fixes: 6be3a5a9cd91 ("backlight: adp88x0: Fix uninitialized variable use")
Acked-by: default avatarMichael Hennerich <michael.hennerich@analog.com>
Acked-by: default avatarJingoo Han <jingoohan1@gmail.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 2f4647a1

drivers/video/backlight/adp8860_bl.c

+5 −3
Original line number Diff line number Diff line
@@ -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, &reg_val);

	if (!error) {

		ret_val = reg_val;

	error |= adp8860_read(data->client, ADP8860_PH1LEVH, &reg_val);

		error = adp8860_read(data->client, ADP8860_PH1LEVH, &reg_val);

	}

	mutex_unlock(&data->lock);



	if (error < 0)

	if (error)

		return error;



	/* Return 13-bit conversion value for the first light sensor */