diff options
author | Jiri Kosina <jkosina@suse.cz> | 2010-06-16 18:08:13 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2010-06-16 18:08:13 +0200 |
commit | f1bbbb6912662b9f6070c5bfc4ca9eb1f06a9d5b (patch) | |
tree | c2c130a74be25b0b2dff992e1a195e2728bdaadd /drivers/mfd/tps65010.c | |
parent | fd0961ff67727482bb20ca7e8ea97b83e9de2ddb (diff) | |
parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
download | op-kernel-dev-f1bbbb6912662b9f6070c5bfc4ca9eb1f06a9d5b.zip op-kernel-dev-f1bbbb6912662b9f6070c5bfc4ca9eb1f06a9d5b.tar.gz |
Merge branch 'master' into for-next
Diffstat (limited to 'drivers/mfd/tps65010.c')
-rw-r--r-- | drivers/mfd/tps65010.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/mfd/tps65010.c b/drivers/mfd/tps65010.c index e595530..d0016b6 100644 --- a/drivers/mfd/tps65010.c +++ b/drivers/mfd/tps65010.c @@ -531,7 +531,6 @@ static int __exit tps65010_remove(struct i2c_client *client) flush_scheduled_work(); debugfs_remove(tps->file); kfree(tps); - i2c_set_clientdata(client, NULL); the_tps = NULL; return 0; } |