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 commit 'v2.6.35-rc1' into amd-iommu/2.6.35
[pandora-kernel.git]
/
drivers
/
mfd
/
88pm860x-i2c.c
diff --git
a/drivers/mfd/88pm860x-i2c.c
b/drivers/mfd/88pm860x-i2c.c
index
4a6e718
..
c933b64
100644
(file)
--- a/
drivers/mfd/88pm860x-i2c.c
+++ b/
drivers/mfd/88pm860x-i2c.c
@@
-200,8
+200,8
@@
static int __devexit pm860x_remove(struct i2c_client *client)
pm860x_device_exit(chip);
i2c_unregister_device(chip->companion);
- i2c_set_clientdata(chip->companion, NULL);
i2c_set_clientdata(chip->client, NULL);
+ i2c_set_clientdata(client, NULL);
kfree(chip);
return 0;
}