summaryrefslogtreecommitdiff
path: root/drivers/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-09-30 18:11:26 +0100
committerMark Brown <broonie@linaro.org>2013-09-30 18:11:26 +0100
commit21a122b5f433cf58dd4cc7d8f284853bf9b17ad1 (patch)
treeaef83ce677b452a21a27499920e26124489060c7 /drivers/regulator
parentf004eaf4d17d205842424a7e95dcff9a46fe3c5f (diff)
parent78925b3a791b3ad485fe56d0b8951a5d043b7cae (diff)
downloadlinux-next-21a122b5f433cf58dd4cc7d8f284853bf9b17ad1.tar.gz
Merge remote-tracking branch 'regulator/topic/tps6524x' into regulator-devm
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/tps6524x-regulator.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/regulator/tps6524x-regulator.c b/drivers/regulator/tps6524x-regulator.c
index 62e8d28beabd..8b9ee3983a6c 100644
--- 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;
}