bbd9ebecee
ath9k: Fix kernel panic during driver initilization mwifiex: add NULL checks in driver unload path bcma: don't fail for bad SPROM CRC zd1211rw: firmware needs duration_id set to zero for non-pspoll frames mac80211: Fix a rwlock bad magic bug rtlwifi: Modify rtl_pci_init to return 0 on success
41 lines
1.2 KiB
Diff
41 lines
1.2 KiB
Diff
From c27111e5b8d6b1e9296f7075cdc35872f672b524 Mon Sep 17 00:00:00 2001
|
|
From: Simon Graham <simon.graham@virtualcomputer.com>
|
|
Date: Thu, 9 Feb 2012 09:55:13 -0500
|
|
Subject: [PATCH] rtlwifi: Modify rtl_pci_init to return 0 on success
|
|
|
|
Fixes problem where caller would think routine succeeded when it failed
|
|
leading to divide by zero panic.
|
|
|
|
Signed-off-by: Simon Graham <simon.graham@virtualcomputer.com>
|
|
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
|
|
Signed-off-by: John W. Linville <linville@tuxdriver.com>
|
|
---
|
|
drivers/net/wireless/rtlwifi/pci.c | 4 ++--
|
|
1 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
|
|
index 39e0907..9245d88 100644
|
|
--- a/drivers/net/wireless/rtlwifi/pci.c
|
|
+++ b/drivers/net/wireless/rtlwifi/pci.c
|
|
@@ -1501,7 +1501,7 @@ static int rtl_pci_init(struct ieee80211_hw *hw, struct pci_dev *pdev)
|
|
return err;
|
|
}
|
|
|
|
- return 1;
|
|
+ return 0;
|
|
}
|
|
|
|
static int rtl_pci_start(struct ieee80211_hw *hw)
|
|
@@ -1870,7 +1870,7 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev,
|
|
}
|
|
|
|
/* Init PCI sw */
|
|
- err = !rtl_pci_init(hw, pdev);
|
|
+ err = rtl_pci_init(hw, pdev);
|
|
if (err) {
|
|
RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
|
|
("Failed to init PCI.\n"));
|
|
--
|
|
1.7.4.4
|
|
|