leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libertas: move removal of lbs_rtap file to lbs_stop_card()

Browse Source 
This prevents us from trying to remove it when it didn't exist, in the
error case.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
David Woodhouse 2007-12-11 12:54:43 -05:00 committed by David S. Miller
parent 6bc822b516
commit 10bca0d5f4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/libertas/main.c
View File

@ -1089,7 +1089,6 @@ int lbs_remove_card(struct lbs_private *priv)
lbs_remove_rtap(priv);
dev = priv->dev;
device_remove_file(&dev->dev, &dev_attr_lbs_rtap);
cancel_delayed_work(&priv->scan_work);
cancel_delayed_work(&priv->assoc_work);
@ -1167,6 +1166,7 @@ int lbs_stop_card(struct lbs_private *priv)
netif_carrier_off(priv->dev);
lbs_debugfs_remove_one(priv);
device_remove_file(&dev->dev, &dev_attr_lbs_rtap);
/* Flush pending command nodes */
spin_lock_irqsave(&priv->driver_lock, flags);