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

Merge branch 'fixes-for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds 

Pull LED fix from Bryan Wu.

* 'fixes-for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds:
  leds: leds-gpio: set devm_gpio_request_one() flags param correctly
parents ef05e9b9 2d7c22f6

drivers/leds/leds-gpio.c

+3 −2
Original line number Diff line number Diff line
@@ -127,7 +127,8 @@ static int create_gpio_led(const struct gpio_led *template, 
		led_dat->cdev.flags |= LED_CORE_SUSPENDRESUME;



	ret = devm_gpio_request_one(parent, template->gpio,

			GPIOF_DIR_OUT | (led_dat->active_low ^ state),

				    (led_dat->active_low ^ state) ?

				    GPIOF_OUT_INIT_HIGH : GPIOF_OUT_INIT_LOW,

				    template->name);

	if (ret < 0)

		return ret;