diff options
author | David S. Miller <davem@davemloft.net> | 2009-12-03 12:51:21 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-12-03 12:51:21 -0800 |
commit | a6c872afb2536f47285e6643f4629dec7520041d (patch) | |
tree | 4b54e69fc6594f9afc1277520a350db04e578e77 /drivers/net/wireless/rtl818x/rtl8187_leds.c | |
parent | 9fe02668fe48a1d546196bc1392330ff28d9bd57 (diff) | |
parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/net/wireless/rtl818x/rtl8187_leds.c')
-rw-r--r-- | drivers/net/wireless/rtl818x/rtl8187_leds.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/rtl818x/rtl8187_leds.c b/drivers/net/wireless/rtl818x/rtl8187_leds.c index a1c670fc155..cf8a4a40fdf 100644 --- a/drivers/net/wireless/rtl818x/rtl8187_leds.c +++ b/drivers/net/wireless/rtl818x/rtl8187_leds.c @@ -210,10 +210,10 @@ void rtl8187_leds_exit(struct ieee80211_hw *dev) /* turn the LED off before exiting */ ieee80211_queue_delayed_work(dev, &priv->led_off, 0); - cancel_delayed_work_sync(&priv->led_off); - cancel_delayed_work_sync(&priv->led_on); rtl8187_unregister_led(&priv->led_rx); rtl8187_unregister_led(&priv->led_tx); + cancel_delayed_work_sync(&priv->led_off); + cancel_delayed_work_sync(&priv->led_on); } #endif /* def CONFIG_RTL8187_LED */ |