Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=10bca0d5f4829a8acd9a7a51cb7b35e38b23280a
Commit:     10bca0d5f4829a8acd9a7a51cb7b35e38b23280a
Parent:     6bc822b5164e66ab9b93f96172df8902bfd37618
Author:     David Woodhouse <[EMAIL PROTECTED]>
AuthorDate: Tue Dec 11 12:54:43 2007 -0500
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Mon Jan 28 15:06:44 2008 -0800

    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 <[EMAIL PROTECTED]>
    Signed-off-by: John W. Linville <[EMAIL PROTECTED]>
---
 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 9f6c119..212cce3 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);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to