summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2011-06-09 11:55:54 +0200
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2011-06-18 17:18:41 +0200
commitbcd4fe2f9e378eb8d4d07e3be69e3b82d5e6d4fc (patch)
treea31e61548a1bbc31d0c0eef75a727572c556a2d8 /drivers/net/wireless
parentiwlagn: finally kill the pointer to pci_dev from iwl-dev.h (diff)
downloadlinux-bcd4fe2f9e378eb8d4d07e3be69e3b82d5e6d4fc.tar.xz
linux-bcd4fe2f9e378eb8d4d07e3be69e3b82d5e6d4fc.zip
iwlagn: waterfall the bus level if prepare card failed
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 17228f77d22f..bec98bd67abd 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -3540,6 +3540,7 @@ int iwl_probe(void *bus_specific, struct iwl_bus_ops *bus_ops,
priv->cfg->name, hw_rev);
if (iwl_prepare_card_hw(priv)) {
+ err = -EIO;
IWL_WARN(priv, "Failed, HW not ready\n");
goto out_free_traffic_mem;
}