From 05858b6045d4a632ee75cfd5abad6edb044696ab Mon Sep 17 00:00:00 2001 From: Henrique de Moraes Holschuh Date: Mon, 21 Jul 2008 21:18:18 -0300 Subject: [PATCH] --- yaml --- r: 107085 b: refs/heads/master c: 37f55e9d78d1b63047b1b7ae175cdce650547ba8 h: refs/heads/master i: 107083: 2e85c534b39f21e5060bba6d0333279fb0bd8068 v: v3 --- [refs] | 2 +- trunk/net/rfkill/rfkill.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e29e21ef1f74..ff636aee7111 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2fd9b2212e25e6411b6f309707f4e2683d164250 +refs/heads/master: 37f55e9d78d1b63047b1b7ae175cdce650547ba8 diff --git a/trunk/net/rfkill/rfkill.c b/trunk/net/rfkill/rfkill.c index 022fe50ab0e0..fc3a4fd88995 100644 --- a/trunk/net/rfkill/rfkill.c +++ b/trunk/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; }