diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-10-13 14:06:50 +0200 |
|---|---|---|
| committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2009-11-16 10:57:16 +0100 |
| commit | 60ef66fcf40f0e7bc9579981aa16bd8218942a83 (patch) | |
| tree | 312abb16f4294abd6e9a339a2bf5923bb525bb8b /drivers/regulator | |
| parent | Merge git://git.infradead.org/users/dwmw2/iommu-2.6.32 (diff) | |
| download | linux-60ef66fcf40f0e7bc9579981aa16bd8218942a83.tar.xz linux-60ef66fcf40f0e7bc9579981aa16bd8218942a83.zip | |
regulator: Handle missing constraints in _regulator_disable()
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 744ea1d0b59b..efe568deda12 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1283,7 +1283,8 @@ static int _regulator_disable(struct regulator_dev *rdev) return -EIO; /* are we the last user and permitted to disable ? */ - if (rdev->use_count == 1 && !rdev->constraints->always_on) { + if (rdev->use_count == 1 && + (rdev->constraints && !rdev->constraints->always_on)) { /* we are last user */ if (_regulator_can_change_status(rdev) && |