diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-09-19 12:37:39 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-09-19 12:37:39 +1000 |
| commit | 1f844186f152c86f917b433ea56c1eb6d1202c2a (patch) | |
| tree | 8324f727b614bf29cfddfb893476eceade46d082 /drivers | |
| parent | 8d465dd4e2fe6bf6d4266258227e21dc15f6cb78 (diff) | |
| parent | bf178f32dc2c4ed913329e33fbec1587b6e19ad4 (diff) | |
Merge remote-tracking branch 'leds/for-next'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/leds/leds-blinkm.c | 3 | ||||
| -rw-r--r-- | drivers/leds/leds-lp55xx-common.c | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/leds/leds-blinkm.c b/drivers/leds/leds-blinkm.c index a502678cc7f5..66d0a57db221 100644 --- a/drivers/leds/leds-blinkm.c +++ b/drivers/leds/leds-blinkm.c @@ -161,13 +161,10 @@ static ssize_t show_color_common(struct device *dev, char *buf, int color) switch (color) { case RED: return scnprintf(buf, PAGE_SIZE, "%02X\n", data->red); - break; case GREEN: return scnprintf(buf, PAGE_SIZE, "%02X\n", data->green); - break; case BLUE: return scnprintf(buf, PAGE_SIZE, "%02X\n", data->blue); - break; default: return -EINVAL; } diff --git a/drivers/leds/leds-lp55xx-common.c b/drivers/leds/leds-lp55xx-common.c index 351825b96f16..075acf5b9fab 100644 --- a/drivers/leds/leds-lp55xx-common.c +++ b/drivers/leds/leds-lp55xx-common.c @@ -165,6 +165,7 @@ static int lp55xx_init_led(struct lp55xx_led *led, led->led_current = pdata->led_config[chan].led_current; led->max_current = pdata->led_config[chan].max_current; led->chan_nr = pdata->led_config[chan].chan_nr; + led->cdev.default_trigger = pdata->led_config[chan].default_trigger; if (led->chan_nr >= max_channel) { dev_err(dev, "Use channel numbers between 0 and %d\n", @@ -586,6 +587,8 @@ int lp55xx_of_populate_pdata(struct device *dev, struct device_node *np) of_property_read_string(child, "chan-name", &cfg[i].name); of_property_read_u8(child, "led-cur", &cfg[i].led_current); of_property_read_u8(child, "max-cur", &cfg[i].max_current); + cfg[i].default_trigger = + of_get_property(child, "linux,default-trigger", NULL); i++; } |