diff options
| author | Henrique de Moraes Holschuh <hmh@hmh.eng.br> | 2008-07-21 21:18:18 -0300 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-07-29 16:36:32 -0400 |
| commit | 37f55e9d78d1b63047b1b7ae175cdce650547ba8 (patch) | |
| tree | bfbaf636dc086d0cc7b904a3dcbfe44c2e2d7a88 /net/rfkill/rfkill.c | |
| parent | 2fd9b2212e25e6411b6f309707f4e2683d164250 (diff) | |
| download | linux-3.10-37f55e9d78d1b63047b1b7ae175cdce650547ba8.tar.gz linux-3.10-37f55e9d78d1b63047b1b7ae175cdce650547ba8.tar.bz2 linux-3.10-37f55e9d78d1b63047b1b7ae175cdce650547ba8.zip | |
rfkill: fix led-trigger unregister order in error unwind
rfkill needs to unregister the led trigger AFTER a call to
rfkill_remove_switch(), otherwise it will not update the LED state,
possibly leaving it ON when it should be OFF.
To make led-trigger unregistering safer, guard against unregistering a
trigger twice, and also against issuing trigger events to a led trigger
that was unregistered. This makes the error unwind paths more resilient.
Refer to "rfkill: Register LED triggers before registering switch".
Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
Cc: Michael Buesch <mb@bu3sch.de>
Cc: Dmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/rfkill/rfkill.c')
| -rw-r--r-- | net/rfkill/rfkill.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/rfkill/rfkill.c b/net/rfkill/rfkill.c index 022fe50ab0e..fc3a4fd8899 100644 --- a/net/rfkill/rfkill.c +++ b/net/rfkill/rfkill.c @@ -590,8 +590,10 @@ static void rfkill_led_trigger_register(struct rfkill *rfkill) static void rfkill_led_trigger_unregister(struct rfkill *rfkill) { #ifdef CONFIG_RFKILL_LEDS - if (rfkill->led_trigger.name) + if (rfkill->led_trigger.name) { led_trigger_unregister(&rfkill->led_trigger); + rfkill->led_trigger.name = NULL; + } #endif } @@ -627,8 +629,8 @@ int rfkill_register(struct rfkill *rfkill) error = device_add(dev); if (error) { - rfkill_led_trigger_unregister(rfkill); rfkill_remove_switch(rfkill); + rfkill_led_trigger_unregister(rfkill); return error; } |