Commit 10bca0d5 authored by David Woodhouse's avatar David Woodhouse Committed by David S. Miller

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: default avatarDavid Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 6bc822b5
...@@ -1089,7 +1089,6 @@ int lbs_remove_card(struct lbs_private *priv) ...@@ -1089,7 +1089,6 @@ int lbs_remove_card(struct lbs_private *priv)
lbs_remove_rtap(priv); lbs_remove_rtap(priv);
dev = priv->dev; dev = priv->dev;
device_remove_file(&dev->dev, &dev_attr_lbs_rtap);
cancel_delayed_work(&priv->scan_work); cancel_delayed_work(&priv->scan_work);
cancel_delayed_work(&priv->assoc_work); cancel_delayed_work(&priv->assoc_work);
...@@ -1167,6 +1166,7 @@ int lbs_stop_card(struct lbs_private *priv) ...@@ -1167,6 +1166,7 @@ int lbs_stop_card(struct lbs_private *priv)
netif_carrier_off(priv->dev); netif_carrier_off(priv->dev);
lbs_debugfs_remove_one(priv); lbs_debugfs_remove_one(priv);
device_remove_file(&dev->dev, &dev_attr_lbs_rtap);
/* Flush pending command nodes */ /* Flush pending command nodes */
spin_lock_irqsave(&priv->driver_lock, flags); spin_lock_irqsave(&priv->driver_lock, flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment