diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-18 02:55:08 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-18 02:55:08 +0300 |
| commit | 9209e4bd4b3b9ee3a104313b426380e8d1f59260 (patch) | |
| tree | 8c2d3f01d7e325ce9b26e144ccc6ffcabdbb132b /drivers/leds/leds-cobalt-qube.c | |
| parent | a695bc683609a2b815915e4cfcd93e4ccc0e2cae (diff) | |
| parent | e45906203d27296b47e56efc1219f9a200bfc2db (diff) | |
| download | linux-9209e4bd4b3b9ee3a104313b426380e8d1f59260.tar.xz | |
Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds
* 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds:
leds: leds-pwm: Set led_classdev max_brightness
leds: leds-lp3944.h - remove unneeded includes
leds: use default-on trigger for Cobalt Qube
leds: drivers/leds/leds-ss4200.c: fix return statement
leds: leds-pca9532.h- indent with tabs, not spaces
leds: Add LED class driver for regulator driven LEDs.
leds: leds-cobalt-qube.c: use resource_size()
leds: leds-cobalt-raq.c - use resource_size()
leds: Add driver for ADP5520/ADP5501 MFD PMICs
leds: Add driver for LT3593 controlled LEDs
leds-ss4200: Check pci_enable_device return
leds: leds-alix2c - take port address from MSR
leds: LED driver for Intel NAS SS4200 series (v5)
Diffstat (limited to 'drivers/leds/leds-cobalt-qube.c')
| -rw-r--r-- | drivers/leds/leds-cobalt-qube.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/leds/leds-cobalt-qube.c b/drivers/leds/leds-cobalt-qube.c index 8816806accd2..da5fb016b1a5 100644 --- a/drivers/leds/leds-cobalt-qube.c +++ b/drivers/leds/leds-cobalt-qube.c @@ -31,7 +31,7 @@ static struct led_classdev qube_front_led = { .name = "qube::front", .brightness = LED_FULL, .brightness_set = qube_front_led_set, - .default_trigger = "ide-disk", + .default_trigger = "default-on", }; static int __devinit cobalt_qube_led_probe(struct platform_device *pdev) @@ -43,7 +43,7 @@ static int __devinit cobalt_qube_led_probe(struct platform_device *pdev) if (!res) return -EBUSY; - led_port = ioremap(res->start, res->end - res->start + 1); + led_port = ioremap(res->start, resource_size(res)); if (!led_port) return -ENOMEM; |