diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-13 07:33:03 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-13 07:33:03 -0500 |
| commit | d37fb92326da880947d4dd72684ef1dd2d245727 (patch) | |
| tree | 9f16c2061f5f1be6c02c355335645a17abb62f0e /drivers/leds/leds-gpio.c | |
| parent | b272efc8600a7bbf2dd91d0eba8a3b8949e84497 (diff) | |
| parent | 1023dbd90c1e3e87921198939917c1f50b4b6af7 (diff) | |
Merge remote-tracking branch 'asoc/topic/adsp' into asoc-arizona
Diffstat (limited to 'drivers/leds/leds-gpio.c')
| -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 | ||