diff options
| author | Mark Brown <broonie@sirena.org.uk> | 2013-04-28 03:13:37 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@sirena.org.uk> | 2013-04-28 03:13:37 +0200 |
| commit | 0e340ce1ddcf41ca435ef695ef004a6f587c749e (patch) | |
| tree | 9f4cc87138ecf29762e1037a8c028c6ddd3ebc03 /drivers/regulator/tps6524x-regulator.c | |
| parent | Merge remote-tracking branch 'regulator/topic/ascend' into v3.9-rc8 (diff) | |
| parent | regulator: Remove NULL test before calling regulator_unregister() (diff) | |
| download | linux-0e340ce1ddcf41ca435ef695ef004a6f587c749e.tar.xz linux-0e340ce1ddcf41ca435ef695ef004a6f587c749e.zip | |
Merge remote-tracking branch 'regulator/topic/core' into v3.9-rc8
Diffstat (limited to 'drivers/regulator/tps6524x-regulator.c')
| -rw-r--r-- | drivers/regulator/tps6524x-regulator.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/regulator/tps6524x-regulator.c b/drivers/regulator/tps6524x-regulator.c index 18b67d28d60b..1094393155ed 100644 --- a/drivers/regulator/tps6524x-regulator.c +++ b/drivers/regulator/tps6524x-regulator.c @@ -585,8 +585,7 @@ static int pmic_remove(struct spi_device *spi) if (!hw) return 0; for (i = 0; i < N_REGULATORS; i++) { - if (hw->rdev[i]) - regulator_unregister(hw->rdev[i]); + regulator_unregister(hw->rdev[i]); hw->rdev[i] = NULL; } spi_set_drvdata(spi, NULL); |