diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-06-09 11:07:56 +0800 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2012-07-05 14:49:10 +0200 |
commit | 8cd578b6e28693f357867a77598a88ef3deb6b39 (patch) | |
tree | 7e88d5bdfe421e281f5ff9997e80396381c72fcb | |
parent | afcc0f8c174ff34305146878c40e7dcc72fcbbdf (diff) | |
download | op-kernel-dev-8cd578b6e28693f357867a77598a88ef3deb6b39.zip op-kernel-dev-8cd578b6e28693f357867a77598a88ef3deb6b39.tar.gz |
gpiolib: wm8994: Pay attention to the value set when enabling as output
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>
Cc: stable@vger.kernel.org
Signed-off-by: Linus Walleij <linus.walleij@linaro.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 92ea535..aa61ad2 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) |