git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuil...
[pandora-kernel.git]
/
drivers
/
hwmon
/
tmp421.c
diff --git
a/drivers/hwmon/tmp421.c
b/drivers/hwmon/tmp421.c
index
738c472
..
6b4165c
100644
(file)
--- a/
drivers/hwmon/tmp421.c
+++ b/
drivers/hwmon/tmp421.c
@@
-295,7
+295,6
@@
exit_remove:
sysfs_remove_group(&client->dev.kobj, &tmp421_group);
exit_free:
sysfs_remove_group(&client->dev.kobj, &tmp421_group);
exit_free:
- i2c_set_clientdata(client, NULL);
kfree(data);
return err;
kfree(data);
return err;
@@
-308,7
+307,6
@@
static int tmp421_remove(struct i2c_client *client)
hwmon_device_unregister(data->hwmon_dev);
sysfs_remove_group(&client->dev.kobj, &tmp421_group);
hwmon_device_unregister(data->hwmon_dev);
sysfs_remove_group(&client->dev.kobj, &tmp421_group);
- i2c_set_clientdata(client, NULL);
kfree(data);
return 0;
kfree(data);
return 0;