Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12325280 authored by John W. Linville's avatar John W. Linville
Browse files

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.

(This also reverts an earlier attempt, commit 42bc0c97 "rtlwifi: Return
correct failure code on error". -- JWL)

Signed-off-by: default avatarSimon Graham <simon.graham@virtualcomputer.com>
Acked-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 2cfc6fc5

drivers/net/wireless/rtlwifi/pci.c

+3 −3
Original line number Diff line number Diff line
@@ -1492,10 +1492,10 @@ static int rtl_pci_init(struct ieee80211_hw *hw, struct pci_dev *pdev) 
	if (err) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

			 "tx ring initialization failed\n");

		return 0;

		return err;

	}



	return 1;

	return 0;

}



static int rtl_pci_start(struct ieee80211_hw *hw)
@@ -1866,7 +1866,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");

		goto fail3;