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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
drivers
/
power
/
ds2782_battery.c
diff --git
a/drivers/power/ds2782_battery.c
b/drivers/power/ds2782_battery.c
index
99c8997
..
ba1bd1a
100644
(file)
--- a/
drivers/power/ds2782_battery.c
+++ b/
drivers/power/ds2782_battery.c
@@
-237,8
+237,6
@@
static int ds2782_battery_remove(struct i2c_client *client)
idr_remove(&battery_id, info->id);
mutex_unlock(&battery_lock);
idr_remove(&battery_id, info->id);
mutex_unlock(&battery_lock);
- i2c_set_clientdata(client, info);
-
kfree(info);
return 0;
}
kfree(info);
return 0;
}
@@
-290,7
+288,6
@@
static int ds2782_battery_probe(struct i2c_client *client,
fail_register:
kfree(info->battery.name);
fail_name:
fail_register:
kfree(info->battery.name);
fail_name:
- i2c_set_clientdata(client, info);
kfree(info);
fail_info:
mutex_lock(&battery_lock);
kfree(info);
fail_info:
mutex_lock(&battery_lock);