diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-15 14:03:17 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-15 14:03:17 -0800 |
commit | fe9d1159b299642f9e1a9b56bbf67a24c31bb418 (patch) | |
tree | 530c6e41beb784adb16a1faae2839edbad2fbb7f /drivers/misc | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 (diff) | |
parent | i2c: Sanity checks on adapter registration (diff) | |
download | linux-dev-fe9d1159b299642f9e1a9b56bbf67a24c31bb418.tar.xz linux-dev-fe9d1159b299642f9e1a9b56bbf67a24c31bb418.zip |
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
i2c: Sanity checks on adapter registration
i2c: Mark i2c_adapter.id as deprecated
i2c: Drivers shouldn't include <linux/i2c-id.h>
i2c: Delete unused adapter IDs
i2c: Remove obsolete cleanup for clientdata
Diffstat (limited to 'drivers/misc')
-rw-r--r-- | drivers/misc/apds9802als.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/misc/apds9802als.c b/drivers/misc/apds9802als.c index 0ed09358027e..644d4cd071cc 100644 --- a/drivers/misc/apds9802als.c +++ b/drivers/misc/apds9802als.c @@ -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; } |