Skip to content

Commit

Permalink
libertas: move removal of lbs_rtap file to lbs_stop_card()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
David Woodhouse authored and David S. Miller committed Jan 28, 2008
1 parent 6bc822b commit 10bca0d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/net/wireless/libertas/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 10bca0d

Please sign in to comment.