diff options
author | Jiri Kosina <jkosina@suse.cz> | 2010-12-22 17:57:02 (GMT) |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2010-12-22 17:57:02 (GMT) |
commit | 4b7bd364700d9ac8372eff48832062b936d0793b (patch) | |
tree | 0dbf78c95456a0b02d07fcd473281f04a87e266d /drivers/misc/apds9802als.c | |
parent | c0d8768af260e2cbb4bf659ae6094a262c86b085 (diff) | |
parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
download | linux-fsl-qoriq-4b7bd364700d9ac8372eff48832062b936d0793b.tar.xz |
Merge branch 'master' into for-next
Conflicts:
MAINTAINERS
arch/arm/mach-omap2/pm24xx.c
drivers/scsi/bfa/bfa_fcpim.c
Needed to update to apply fixes for which the old branch was too
outdated.
Diffstat (limited to 'drivers/misc/apds9802als.c')
-rw-r--r-- | drivers/misc/apds9802als.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/misc/apds9802als.c b/drivers/misc/apds9802als.c index f9b91ba..644d4cd 100644 --- a/drivers/misc/apds9802als.c +++ b/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)) @@ -251,7 +251,6 @@ static int apds9802als_probe(struct i2c_client *client, return res; als_error1: - i2c_set_clientdata(client, NULL); kfree(data); return res; } |