Merge remote-tracking branch 'regulator/topic/tps6524x' into regulator-devm

diff --git a/drivers/regulator/tps6524x-regulator.c b/drivers/regulator/tps6524x-regulator.c
index 62e8d28beabd7cc8ad51b2935e29b7d348e17438..8b9ee3983a6cf8145fec958f4e851371fa888973 100644 (file)
--- a/drivers/regulator/tps6524x-regulator.c
+++ b/drivers/regulator/tps6524x-regulator.c
@@ -588,7 +588,6 @@ static int pmic_remove(struct spi_device *spi)
                regulator_unregister(hw->rdev[i]);
                hw->rdev[i] = NULL;
        }
-       spi_set_drvdata(spi, NULL);
        return 0;
 }