From 3373c6a92f4d33baa72b8b4f4ddf8589b2b0bb88 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Sat, 9 Jun 2012 11:07:56 +0800 Subject: [PATCH] --- yaml --- r: 311761 b: refs/heads/master c: 8cd578b6e28693f357867a77598a88ef3deb6b39 h: refs/heads/master i: 311759: 18f1161d5f37cd46519b92650d44bf69b16d34ba v: v3 --- [refs] | 2 +- trunk/drivers/gpio/gpio-wm8994.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 24a2085ff8ab..fba257def1cb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: afcc0f8c174ff34305146878c40e7dcc72fcbbdf +refs/heads/master: 8cd578b6e28693f357867a77598a88ef3deb6b39 diff --git a/trunk/drivers/gpio/gpio-wm8994.c b/trunk/drivers/gpio/gpio-wm8994.c index 92ea5350dfe9..aa61ad2fcaaa 100644 --- a/trunk/drivers/gpio/gpio-wm8994.c +++ b/trunk/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)