diff options
| author | Liam Girdwood <lrg@slimlogic.co.uk> | 2011-08-01 19:25:06 +0200 |
|---|---|---|
| committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2011-08-01 19:25:06 +0200 |
| commit | 424c3d4a2c7d4ac3467a4849f8ccc230f670c35a (patch) | |
| tree | 55806b1367b42ec210f273c16bf350182ac6fd62 /drivers/regulator/wm8994-regulator.c | |
| parent | Linux 3.0 (diff) | |
| parent | regulator: Improve WM831x DVS VSEL selection algorithm (diff) | |
| download | linux-424c3d4a2c7d4ac3467a4849f8ccc230f670c35a.tar.xz linux-424c3d4a2c7d4ac3467a4849f8ccc230f670c35a.zip | |
Merge branch 'for-next' into for-linus
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; |