Selaa lähdekoodia

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>
David Woodhouse 17 vuotta sitten
vanhempi
commit
10bca0d5f4
1 muutettua tiedostoa jossa 1 lisäystä ja 1 poistoa
  1. 1 1
      drivers/net/wireless/libertas/main.c

+ 1 - 1
drivers/net/wireless/libertas/main.c

@@ -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)
 	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);