Merge commit 'kumar/merge' into merge

[~andy/linux] / drivers / mfd / menelaus.c

diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c
index a94b131a18efc72a2a7a6ebb4ec8bce6ef8ada2a..a3fb4bcb98897718400da09d23dfd95116b99f58 100644 (file)
--- 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;
 }