From 9363ce9f4702654ade68441cb1b5997b640ebbb0 Mon Sep 17 00:00:00 2001 From: Henrique de Moraes Holschuh Date: Fri, 3 Oct 2008 16:58:05 -0300 Subject: [PATCH] --- yaml --- r: 112051 b: refs/heads/master c: 417bd25ac4c6f76c8aafe8a584f3620f4a936b72 h: refs/heads/master i: 112049: de369d8b3186e645cae1000b97ec548debeb5011 112047: ad0b7320ff8bcb8917a2c74978879da9afdfd180 v: v3 --- [refs] | 2 +- trunk/net/rfkill/rfkill.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 8195ffaea4b9..61157fe73e7c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5b5d13afeeee959a74114b73c560d3e243f34a11 +refs/heads/master: 417bd25ac4c6f76c8aafe8a584f3620f4a936b72 diff --git a/trunk/net/rfkill/rfkill.c b/trunk/net/rfkill/rfkill.c index ea0dc04b3c77..f949a482b007 100644 --- a/trunk/net/rfkill/rfkill.c +++ b/trunk/net/rfkill/rfkill.c @@ -125,6 +125,7 @@ static void rfkill_led_trigger_activate(struct led_classdev *led) static void notify_rfkill_state_change(struct rfkill *rfkill) { + rfkill_led_trigger(rfkill, rfkill->state); blocking_notifier_call_chain(&rfkill_notifier_list, RFKILL_STATE_CHANGED, rfkill); @@ -217,10 +218,8 @@ static int rfkill_toggle_radio(struct rfkill *rfkill, rfkill->state = state; } - if (force || rfkill->state != oldstate) { - rfkill_led_trigger(rfkill, rfkill->state); + if (force || rfkill->state != oldstate) notify_rfkill_state_change(rfkill); - } return retval; }