diff --git a/[refs] b/[refs] index 84647029ecf9..e4e1e1a79227 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 90482e45e4a39ee10b66436c2b3d5d4d88c2f73c +refs/heads/master: 1093736b3c34319b8f1825a4423414d9cf397d73 diff --git a/trunk/drivers/misc/apds9802als.c b/trunk/drivers/misc/apds9802als.c index f9b91ba8900c..0ed09358027e 100644 --- a/trunk/drivers/misc/apds9802als.c +++ b/trunk/drivers/misc/apds9802als.c @@ -123,7 +123,7 @@ static ssize_t als_sensing_range_store(struct device *dev, { struct i2c_client *client = to_i2c_client(dev); struct als_data *data = i2c_get_clientdata(client); - unsigned int ret_val; + int ret_val; unsigned long val; if (strict_strtoul(buf, 10, &val))