diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-05-24 11:14:40 -0400 |
---|---|---|
committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2011-05-30 06:56:58 -0400 |
commit | 2ae3636b79aee1a69b2e84eff68bb123090796d3 (patch) | |
tree | aeae772a31206c93cb1f1fd02cfe991f95a93bbe /drivers/regulator | |
parent | f21e0e81d81b649ad309cedc7226f1bed72982e0 (diff) |
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')
-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) | |||
43 | if (!ldo->enable) | 43 | if (!ldo->enable) |
44 | return 0; | 44 | return 0; |
45 | 45 | ||
46 | gpio_set_value(ldo->enable, 1); | 46 | gpio_set_value_cansleep(ldo->enable, 1); |
47 | ldo->is_enabled = true; | 47 | ldo->is_enabled = true; |
48 | 48 | ||
49 | return 0; | 49 | return 0; |
@@ -57,7 +57,7 @@ static int wm8994_ldo_disable(struct regulator_dev *rdev) | |||
57 | if (!ldo->enable) | 57 | if (!ldo->enable) |
58 | return -EINVAL; | 58 | return -EINVAL; |
59 | 59 | ||
60 | gpio_set_value(ldo->enable, 0); | 60 | gpio_set_value_cansleep(ldo->enable, 0); |
61 | ldo->is_enabled = false; | 61 | ldo->is_enabled = false; |
62 | 62 | ||
63 | return 0; | 63 | return 0; |