Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39618435 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gpio-fixes-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio 

Pull GPIO fix from Linus Walleij:
 "A late GPIO fix: Roland Stigge found a problem in the LPC32xx driver
  where a callback ignores one of its arguments.  It needs to go into
  stable too so sending this upstream immediately."

* tag 'gpio-fixes-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
  gpio-lpc32xx: Fix value handling of gpio_direction_output()
parents d1d4bb9c b1268d37

drivers/gpio/gpio-lpc32xx.c

+5 −0
Original line number Diff line number Diff line
@@ -308,6 +308,7 @@ static int lpc32xx_gpio_dir_output_p012(struct gpio_chip *chip, unsigned pin, 
{

	struct lpc32xx_gpio_chip *group = to_lpc32xx_gpio(chip);



	__set_gpio_level_p012(group, pin, value);

	__set_gpio_dir_p012(group, pin, 0);



	return 0;
@@ -318,6 +319,7 @@ static int lpc32xx_gpio_dir_output_p3(struct gpio_chip *chip, unsigned pin, 
{

	struct lpc32xx_gpio_chip *group = to_lpc32xx_gpio(chip);



	__set_gpio_level_p3(group, pin, value);

	__set_gpio_dir_p3(group, pin, 0);



	return 0;
@@ -326,6 +328,9 @@ static int lpc32xx_gpio_dir_output_p3(struct gpio_chip *chip, unsigned pin, 
static int lpc32xx_gpio_dir_out_always(struct gpio_chip *chip, unsigned pin,

	int value)

{

	struct lpc32xx_gpio_chip *group = to_lpc32xx_gpio(chip);



	__set_gpo_level_p3(group, pin, value);

	return 0;

}