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

Commit 90482e45 authored by Dan Carpenter's avatar Dan Carpenter Committed by Linus Torvalds
Browse files

misc/isl29020: signedness bug in als_sensing_range_store() 



"ret_val" is supposed to be signed here or the error handling breaks.
Also we should check the return value from i2c_smbus_read_byte_data().

Signed-off-by: default avatarDan Carpenter <error27@gmail.com>
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 43b3a0c7

drivers/misc/isl29020.c

+3 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static ssize_t als_sensing_range_store(struct device *dev, 
		struct device_attribute *attr, const  char *buf, size_t count)

{

	struct i2c_client *client = to_i2c_client(dev);

	unsigned int ret_val;

	int ret_val;

	unsigned long val;



	if (strict_strtoul(buf, 10, &val))
@@ -106,6 +106,8 @@ static ssize_t als_sensing_range_store(struct device *dev, 
		val = 4;



	ret_val = i2c_smbus_read_byte_data(client, 0x00);

	if (ret_val < 0)

		return ret_val;



	ret_val &= 0xFC; /*reset the bit before setting them */

	ret_val |= val - 1;