Merge tag 'for-linus-3.11-merge-window-part-2' of git://git.kernel.org/pub/scm/linux...

[firefly-linux-kernel-4.4.55.git] / drivers / power / 88pm860x_battery.c

diff --git a/drivers/power/88pm860x_battery.c b/drivers/power/88pm860x_battery.c
index d338c1c4e8c8522c88014861a5f93b213e0191d1..dfcda3a49403fbac3d65e0d87b0a25e5b81fd8fa 100644 (file)
--- a/drivers/power/88pm860x_battery.c
+++ b/drivers/power/88pm860x_battery.c
@@ -992,7 +992,6 @@ static int pm860x_battery_remove(struct platform_device *pdev)
        free_irq(info->irq_batt, info);
        free_irq(info->irq_cc, info);
        power_supply_unregister(&info->battery);
-       platform_set_drvdata(pdev, NULL);
        return 0;
 }