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

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
...@@ -87,7 +87,7 @@ static ssize_t als_sensing_range_store(struct device *dev, ...@@ -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 device_attribute *attr, const char *buf, size_t count)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
unsigned int ret_val; int ret_val;
unsigned long val; unsigned long val;
if (strict_strtoul(buf, 10, &val)) if (strict_strtoul(buf, 10, &val))
...@@ -106,6 +106,8 @@ static ssize_t als_sensing_range_store(struct device *dev, ...@@ -106,6 +106,8 @@ static ssize_t als_sensing_range_store(struct device *dev,
val = 4; val = 4;
ret_val = i2c_smbus_read_byte_data(client, 0x00); 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 &= 0xFC; /*reset the bit before setting them */
ret_val |= val - 1; ret_val |= val - 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment