summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2013-06-05 10:16:33 +0800
committerJohn W. Linville <linville@tuxdriver.com>2013-06-12 14:59:39 -0400
commitca3ae51396c049fcb9a93ded6f90ec81f7360ffa (patch)
treeb570c1cbeca9fa9a43abdbd79fb93bc6bd51822b
parentc9e2404c9ffcbb31b0bd1348be5fc7a4de6f90d6 (diff)
downloadtalos-op-linux-ca3ae51396c049fcb9a93ded6f90ec81f7360ffa.tar.gz
talos-op-linux-ca3ae51396c049fcb9a93ded6f90ec81f7360ffa.zip
iwlegacy: fix error return code in il3945_pci_probe()
Fix to return a negative error code in the il3945_hw_set_hw_params() error handling case instead of 0, as done elsewhere in this function. Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Acked-by: Stanislaw Gruszka <sgruszka@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/iwlegacy/3945-mac.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
index b37a582ccbe7..866ce6c68405 100644
--- a/drivers/net/wireless/iwlegacy/3945-mac.c
+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
@@ -3727,7 +3727,8 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
* 5. Setup HW Constants
* ********************/
/* Device-specific setup */
- if (il3945_hw_set_hw_params(il)) {
+ err = il3945_hw_set_hw_params(il);
+ if (err) {
IL_ERR("failed to set hw settings\n");
goto out_eeprom_free;
}
OpenPOWER on IntegriCloud