Skip to content

Commit

Permalink
misc/isl29020: signedness bug in als_sensing_range_store()
Browse files Browse the repository at this point in the history
"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: Dan Carpenter <error27@gmail.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Dan Carpenter authored and Linus Torvalds committed Nov 12, 2010
1 parent 43b3a0c commit 90482e4
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/misc/isl29020.c
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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;
Expand Down

0 comments on commit 90482e4

Please sign in to comment.