summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Graham <simon.graham@virtualcomputer.com>2012-02-09 09:55:13 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-02-09 15:17:29 -0500
commitc27111e5b8d6b1e9296f7075cdc35872f672b524 (patch)
tree44fc683ecd2b5cf186979b16f6a7c149e24675e1
parentb57e6b560fc2a2742910ac5ca0eb2c46e45aeac2 (diff)
downloadop-kernel-dev-c27111e5b8d6b1e9296f7075cdc35872f672b524.zip
op-kernel-dev-c27111e5b8d6b1e9296f7075cdc35872f672b524.tar.gz
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>
-rw-r--r--drivers/net/wireless/rtlwifi/pci.c4
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"));
OpenPOWER on IntegriCloud