aboutsummaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2007-12-11 12:54:43 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 15:06:44 -0800
commit10bca0d5f4829a8acd9a7a51cb7b35e38b23280a (patch)
tree43ae681a798a90af7c02b0a5d417b7f197f70eea /drivers/net
parent6bc822b5164e66ab9b93f96172df8902bfd37618 (diff)
libertas: move removal of lbs_rtap file to lbs_stop_card()
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>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/libertas/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index 9f6c119c2d1..212cce34227 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -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);