leds-ss4200: fix led_classdev_unregister twice in error handling
PATCH 1/1 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 )
--- drivers/leds/leds-ss4200.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/leds/leds-ss4200.c +1 -1
@@ -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;
Signature · 1 line
1.5.4.3
Quoted 9 lines · Axel Lin
In current implementation, if
device_create_filefailed inregister_nasgpio_led,led_classdev_unregisterwill be executed twice.
( inregister_nasgpio_ledit callsled_classdev_unregisterbefore return and innas_gpio_initout_err)This patch fixes it by only unregistering those that were successfully registered in
out_err.
( not including last failedregister_nasgpio_ledcall )
Did you actually run into this, or did you find this just auditing code?
drivers/leds/leds-ss4200.c static int __init nas_gpio_init(void) · line 540
Quoted 13 lines
drivers/leds/leds-ss4200.c +1
-1@@ -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;
That i-- took me a minute to grok, but there isn't something immensely better here. If you have to resubmit these somehow, please add a comment there. But, otherwise,
-- Dave