Commit 3383d23d authored by Mark Brown's avatar Mark Brown Committed by Samuel Ortiz
Browse files

gpiolib: Actually set output state in wm831x_gpio_direction_output() 



wm831x_gpio_direction_output() ignored the state passed into it.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@kernel.org
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 7ee422dc

drivers/gpio/wm831x-gpio.c

+15 −7
Original line number Diff line number Diff line
@@ -60,23 +60,31 @@ static int wm831x_gpio_get(struct gpio_chip *chip, unsigned offset) 
		return 0;

}



static int wm831x_gpio_direction_out(struct gpio_chip *chip,

				     unsigned offset, int value)

static void wm831x_gpio_set(struct gpio_chip *chip, unsigned offset, int value)

{

	struct wm831x_gpio *wm831x_gpio = to_wm831x_gpio(chip);

	struct wm831x *wm831x = wm831x_gpio->wm831x;



	return wm831x_set_bits(wm831x, WM831X_GPIO1_CONTROL + offset,

			       WM831X_GPN_DIR | WM831X_GPN_TRI, 0);

	wm831x_set_bits(wm831x, WM831X_GPIO_LEVEL, 1 << offset,

			value << offset);

}



static void wm831x_gpio_set(struct gpio_chip *chip, unsigned offset, int value)

static int wm831x_gpio_direction_out(struct gpio_chip *chip,

				     unsigned offset, int value)

{

	struct wm831x_gpio *wm831x_gpio = to_wm831x_gpio(chip);

	struct wm831x *wm831x = wm831x_gpio->wm831x;

	int ret;



	wm831x_set_bits(wm831x, WM831X_GPIO_LEVEL, 1 << offset,

			value << offset);

	ret = wm831x_set_bits(wm831x, WM831X_GPIO1_CONTROL + offset,

			      WM831X_GPN_DIR | WM831X_GPN_TRI, 0);

	if (ret < 0)

		return ret;



	/* Can only set GPIO state once it's in output mode */

	wm831x_gpio_set(chip, offset, value);



	return 0;

}



static int wm831x_gpio_to_irq(struct gpio_chip *chip, unsigned offset)