diff options
| author | David Woodhouse | 2007-12-11 18:54:43 +0100 |
|---|---|---|
| committer | David S. Miller | 2008-01-29 00:06:44 +0100 |
| commit | 10bca0d5f4829a8acd9a7a51cb7b35e38b23280a (patch) | |
| tree | 43ae681a798a90af7c02b0a5d417b7f197f70eea | |
| parent | libertas: switch USB cardp->priv to 'struct lbs_private *' and resulting fix (diff) | |
| download | kernel-qcow2-linux-10bca0d5f4829a8acd9a7a51cb7b35e38b23280a.tar.gz kernel-qcow2-linux-10bca0d5f4829a8acd9a7a51cb7b35e38b23280a.tar.xz kernel-qcow2-linux-10bca0d5f4829a8acd9a7a51cb7b35e38b23280a.zip | |
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>
| -rw-r--r-- | drivers/net/wireless/libertas/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c index 9f6c119c2d1b..212cce342272 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); |