diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-02 21:12:35 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-02 21:12:35 -0500 |
| commit | d50403dcc5092e9c7d6a2525dcfc5813f7c35194 (patch) | |
| tree | 7cc1113ae98da24f0c59ea1b1c126beca4971418 /drivers | |
| parent | ef05e9b9602660fd468e05f5fbe8f08ad7418b73 (diff) | |
| parent | 2d7c22f67d5c342a6296127af4f224208449b779 (diff) | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/leds/leds-gpio.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c index 1885a26776b1..a0d931bcb37c 100644 --- a/drivers/leds/leds-gpio.c +++ b/drivers/leds/leds-gpio.c | |||
| @@ -127,8 +127,9 @@ static int create_gpio_led(const struct gpio_led *template, | |||
| 127 | led_dat->cdev.flags |= LED_CORE_SUSPENDRESUME; | 127 | led_dat->cdev.flags |= LED_CORE_SUSPENDRESUME; |
| 128 | 128 | ||
| 129 | ret = devm_gpio_request_one(parent, template->gpio, | 129 | ret = devm_gpio_request_one(parent, template->gpio, |
| 130 | GPIOF_DIR_OUT | (led_dat->active_low ^ state), | 130 | (led_dat->active_low ^ state) ? |
| 131 | template->name); | 131 | GPIOF_OUT_INIT_HIGH : GPIOF_OUT_INIT_LOW, |
| 132 | template->name); | ||
| 132 | if (ret < 0) | 133 | if (ret < 0) |
| 133 | return ret; | 134 | return ret; |
| 134 | 135 | ||