diff options
| author | David S. Miller <davem@davemloft.net> | 2010-06-26 10:27:00 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-26 10:27:00 -0700 |
| commit | c67dda14389205f0a223c5089307495290939b3b (patch) | |
| tree | fad0bb26b28703d02a22ebdd44d94eabac4a2ade /drivers/mfd/menelaus.c | |
| parent | 43bc2db47292a824152145253b1dd2847e7312a3 (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/mfd/menelaus.c')
| -rw-r--r-- | drivers/mfd/menelaus.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c index a94b131a18e..a3fb4bcb988 100644 --- a/drivers/mfd/menelaus.c +++ b/drivers/mfd/menelaus.c @@ -1238,7 +1238,6 @@ static int __exit menelaus_remove(struct i2c_client *client) free_irq(client->irq, menelaus); kfree(menelaus); - i2c_set_clientdata(client, NULL); the_menelaus = NULL; return 0; } |