Merge commit 'kumar/merge' into merge

[~andy/linux] / drivers / mfd / max8925-i2c.c

diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c
index d9fd8785da4d76a78a9e9a95661d1f93c7d46e72..0219115e00c73f84c925045afceb96d65ea83ea3 100644 (file)
--- a/drivers/mfd/max8925-i2c.c
+++ b/drivers/mfd/max8925-i2c.c
@@ -173,9 +173,6 @@ static int __devexit max8925_remove(struct i2c_client *client)
        max8925_device_exit(chip);
        i2c_unregister_device(chip->adc);
        i2c_unregister_device(chip->rtc);
-       i2c_set_clientdata(chip->adc, NULL);
-       i2c_set_clientdata(chip->rtc, NULL);
-       i2c_set_clientdata(chip->i2c, NULL);
        kfree(chip);
        return 0;
 }