2011-05-24 15:14:47

by Mark Brown

Subject: [PATCH] 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 <[email protected]>
---
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 35b2958..1a6a690 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;
--
1.7.5.1

2011-05-25 09:48:08

by Liam Girdwood

Subject: Re: [PATCH] regulator: Use _cansleep() for WM8994 regulator GPIOs

On 24/05/11 16:14, Mark Brown wrote:
> 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 <[email protected]>
> ---
> drivers/regulator/wm8994-regulator.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>

Applied.

Thanks

Liam