diff options
| author | Amitkumar Karwar <akarwar@marvell.com> | 2013-07-22 19:17:54 -0700 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-07-24 11:02:10 -0400 |
| commit | bedb361b5092ee9aa77ba9d0114bf75e8520825e (patch) | |
| tree | 58e74743868c6bbcdb9d5572373ac16844ffdd2e /drivers/net/wireless/mwifiex | |
| parent | a76b20e5ca8a9ec0b45a4150b4ad19e27dd19699 (diff) | |
| download | op-kernel-dev-bedb361b5092ee9aa77ba9d0114bf75e8520825e.zip op-kernel-dev-bedb361b5092ee9aa77ba9d0114bf75e8520825e.tar.gz | |
mwifiex: correction in mwifiex_check_fw_status() return status
For PCIe cards, when wrong firmware is downloaded, firmware is
failed to be ready in 10 seconds. We should return an error at
this point. But currently we are sending first command to firmware.
As expected firmware doesn't respond to this command and command
timeout occurs.
This patch fixes the problem by removing unnecessary 'ret'
variable modifications in "if (ret) {" block.
The block is just supposed to update "adapter->winner" flag.
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/mwifiex')
| -rw-r--r-- | drivers/net/wireless/mwifiex/pcie.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/mwifiex/pcie.c b/drivers/net/wireless/mwifiex/pcie.c index 098153f..52da8ee 100644 --- a/drivers/net/wireless/mwifiex/pcie.c +++ b/drivers/net/wireless/mwifiex/pcie.c @@ -1954,12 +1954,10 @@ mwifiex_check_fw_status(struct mwifiex_adapter *adapter, u32 poll_num) else if (!winner_status) { dev_err(adapter->dev, "PCI-E is the winner\n"); adapter->winner = 1; - ret = -1; } else { dev_err(adapter->dev, "PCI-E is not the winner <%#x,%d>, exit dnld\n", ret, adapter->winner); - ret = 0; } } |
