diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-11-18 10:53:52 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-11-18 10:53:52 +0900 |
commit | 260af56271f79da0e37faa5a99b1786b221297e5 (patch) | |
tree | d76a2609f940b88083314d5f9131c73115bd4dcb /drivers/net/wireless/rtl818x/rtl8187_leds.c | |
parent | 1dca899e95d27475c9036ce1cf857a72852b9c53 (diff) | |
parent | 648f15345add88a7eea724365fe1217a8d8a1e16 (diff) | |
download | talos-obmc-linux-260af56271f79da0e37faa5a99b1786b221297e5.tar.gz talos-obmc-linux-260af56271f79da0e37faa5a99b1786b221297e5.zip |
Merge branch 'sh/stable-updates'
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 a1c670fc1552..cf8a4a40fdf6 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 */ |