diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-06-09 11:07:56 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-16 09:04:09 -0700 |
| commit | 96e1ecef17e300d49ecc5b7378a82e7389227191 (patch) | |
| tree | 9448611d823c7d3f5a75d9123b736b238dc973b6 | |
| parent | 8bd6035bfc6a0c401e1ed01d2658e502a6f6683b (diff) | |
| download | linux-3.10-96e1ecef17e300d49ecc5b7378a82e7389227191.tar.gz linux-3.10-96e1ecef17e300d49ecc5b7378a82e7389227191.tar.bz2 linux-3.10-96e1ecef17e300d49ecc5b7378a82e7389227191.zip | |
gpiolib: wm8994: Pay attention to the value set when enabling as output
commit 8cd578b6e28693f357867a77598a88ef3deb6b39 upstream.
Not paying attention to the value being set is a bad thing because it
means that we'll not set the hardware up to reflect what was requested.
Not setting the hardware up to reflect what was requested means that the
caller won't get the results they wanted.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/gpio/gpio-wm8994.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-wm8994.c b/drivers/gpio/gpio-wm8994.c index 92ea5350dfe..aa61ad2fcaa 100644 --- a/drivers/gpio/gpio-wm8994.c +++ b/drivers/gpio/gpio-wm8994.c @@ -89,8 +89,11 @@ static int wm8994_gpio_direction_out(struct gpio_chip *chip, struct wm8994_gpio *wm8994_gpio = to_wm8994_gpio(chip); struct wm8994 *wm8994 = wm8994_gpio->wm8994; + if (value) + value = WM8994_GPN_LVL; + return wm8994_set_bits(wm8994, WM8994_GPIO_1 + offset, - WM8994_GPN_DIR, 0); + WM8994_GPN_DIR | WM8994_GPN_LVL, value); } static void wm8994_gpio_set(struct gpio_chip *chip, unsigned offset, int value) |