diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-02-15 19:41:52 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-02-15 19:41:52 +0100 |
| commit | 33b5d30cd8b200024d55ac5830c9efde1102ef4c (patch) | |
| tree | 4788d50ad6994a40bda8e146db4ca9674a482b92 /drivers | |
| parent | 3c59x: shorten timer period for slave devices (diff) | |
| parent | rtlwifi: Modify rtl_pci_init to return 0 on success (diff) | |
| download | linux-33b5d30cd8b200024d55ac5830c9efde1102ef4c.tar.xz linux-33b5d30cd8b200024d55ac5830c9efde1102ef4c.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers')
| -rw-r--r-- | 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 39e0907a3c4e..9245d882c06a 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")); |