diff options
| author | Mark Brown | 2011-05-24 17:14:40 +0200 |
|---|---|---|
| committer | Liam Girdwood | 2011-05-30 12:56:58 +0200 |
| commit | 2ae3636b79aee1a69b2e84eff68bb123090796d3 (patch) | |
| tree | aeae772a31206c93cb1f1fd02cfe991f95a93bbe /drivers/regulator/wm8994-regulator.c | |
| parent | regulator: Do bulk enables of regulators in parallel (diff) | |
| download | kernel-qcow2-linux-2ae3636b79aee1a69b2e84eff68bb123090796d3.tar.gz kernel-qcow2-linux-2ae3636b79aee1a69b2e84eff68bb123090796d3.tar.xz kernel-qcow2-linux-2ae3636b79aee1a69b2e84eff68bb123090796d3.zip | |
regulator: Use _cansleep() for WM8994 regulator GPIOs
The WM8994 regulator driver is perfectly happy if the GPIO used to enable
the regulator sleeps so call the appropriate GPIO API.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'drivers/regulator/wm8994-regulator.c')
| -rw-r--r-- | drivers/regulator/wm8994-regulator.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/wm8994-regulator.c b/drivers/regulator/wm8994-regulator.c index 35b2958d5106..1a6a690f24db 100644 --- a/drivers/regulator/wm8994-regulator.c +++ b/drivers/regulator/wm8994-regulator.c @@ -43,7 +43,7 @@ static int wm8994_ldo_enable(struct regulator_dev *rdev) if (!ldo->enable) return 0; - gpio_set_value(ldo->enable, 1); + gpio_set_value_cansleep(ldo->enable, 1); ldo->is_enabled = true; return 0; @@ -57,7 +57,7 @@ static int wm8994_ldo_disable(struct regulator_dev *rdev) if (!ldo->enable) return -EINVAL; - gpio_set_value(ldo->enable, 0); + gpio_set_value_cansleep(ldo->enable, 0); ldo->is_enabled = false; return 0; |