summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2010-05-17 13:42:43 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-05-26 13:07:56 +0100
commit1e653accf7d2b02e75af550963b261b3243ac20e (patch)
treef99ceca467627432ac96058bba479af1a3bf4fab
parent7e1ce34f25c984a93dc0a2d8c217f7f78516b376 (diff)
leds: leds-ss4200: fix led_classdev_unregister twice in error handling
In current implementation, if device_create_file failed in register_nasgpio_led, led_classdev_unregister will be executed twice. ( in register_nasgpio_led it calls led_classdev_unregister before return and in nas_gpio_init out_err ) This patch fixes it by only unregistering those that were successfully registered in out_err. ( not including last failed register_nasgpio_led call ) Signed-off-by: Axel Lin <axel.lin@gmail.com> Acked-by: Dave Hansen <dave@sr71.net> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--drivers/leds/leds-ss4200.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/leds/leds-ss4200.c b/drivers/leds/leds-ss4200.c
index 51477ec71391..a688293abd0b 100644
--- a/drivers/leds/leds-ss4200.c
+++ b/drivers/leds/leds-ss4200.c
@@ -534,7 +534,7 @@ static int __init nas_gpio_init(void)
set_power_light_amber_noblink();
return 0;
out_err:
- for (; i >= 0; i--)
+ for (i--; i >= 0; i--)
unregister_nasgpio_led(i);
pci_unregister_driver(&nas_gpio_pci_driver);
return ret;