diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-30 13:11:26 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-30 13:11:26 -0400 |
| commit | 21a122b5f433cf58dd4cc7d8f284853bf9b17ad1 (patch) | |
| tree | aef83ce677b452a21a27499920e26124489060c7 | |
| parent | f004eaf4d17d205842424a7e95dcff9a46fe3c5f (diff) | |
| parent | 78925b3a791b3ad485fe56d0b8951a5d043b7cae (diff) | |
Merge remote-tracking branch 'regulator/topic/tps6524x' into regulator-devm
| -rw-r--r-- | drivers/regulator/tps6524x-regulator.c | 1 |
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) | |||
| 588 | regulator_unregister(hw->rdev[i]); | 588 | regulator_unregister(hw->rdev[i]); |
| 589 | hw->rdev[i] = NULL; | 589 | hw->rdev[i] = NULL; |
| 590 | } | 590 | } |
| 591 | spi_set_drvdata(spi, NULL); | ||
| 592 | return 0; | 591 | return 0; |
| 593 | } | 592 | } |
| 594 | 593 | ||