From ffc47daa2f6f66965d924de1c83656d7a6ce1abd Mon Sep 17 00:00:00 2001 From: Gregory Greenman Date: Wed, 3 Sep 2008 11:18:50 +0800 Subject: [PATCH] --- yaml --- r: 109455 b: refs/heads/master c: 0b124c31838bcf0459708aa91ce859582c7d3ca1 h: refs/heads/master i: 109453: eb8ae38eb708d169344cefbd09c7930685f507a0 109451: 51283acdf97ba3121c8cfd0dd6ac25ff5d1250e0 109447: 96d71e3ebcdcc4ba953a4f42dbf4f4636ebae173 109439: 7ae2b0cf74feb28b7b62d2d55cbcb59b8a35ed73 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-agn.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index ca016034b172..858c8eae615b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d535311ecbba0d692b5f1278b8bcb2581c3482e0 +refs/heads/master: 0b124c31838bcf0459708aa91ce859582c7d3ca1 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c b/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c index 4e3d6c7fd6de..e01f048a02dd 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c @@ -4372,15 +4372,18 @@ static void __devexit iwl4965_pci_remove(struct pci_dev *pdev) iwl_dbgfs_unregister(priv); sysfs_remove_group(&pdev->dev.kobj, &iwl4965_attribute_group); + /* ieee80211_unregister_hw call wil cause iwl4965_mac_stop to + * to be called and iwl4965_down since we are removing the device + * we need to set STATUS_EXIT_PENDING bit. + */ + set_bit(STATUS_EXIT_PENDING, &priv->status); if (priv->mac80211_registered) { ieee80211_unregister_hw(priv->hw); priv->mac80211_registered = 0; + } else { + iwl4965_down(priv); } - set_bit(STATUS_EXIT_PENDING, &priv->status); - - iwl4965_down(priv); - /* make sure we flush any pending irq or * tasklet for the driver */