UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

wil6210: check error in wil_target_reset() 

When resetting target in wil_target_reset(), error may occur.
Indicate error via error code. In case of error, don't attempt to further
interact with card, specifically don't attempt firmware download or
interrupts enabling.

Move wil_rx_fini() to be always executed to prevent memory leak.

Signed-off-by: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Vladimir Kondratiev 2014-08-06 10:31:52 +03:00 committed by John W. Linville
parent 02525a7925
commit bbb2adc7b4
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/wireless/ath/wil6210/main.c
View File

@ -309,7 +309,7 @@ void wil_priv_deinit(struct wil6210_priv *wil)
destroy_workqueue(wil->wmi_wq);
}
static void wil_target_reset(struct wil6210_priv *wil)
static int wil_target_reset(struct wil6210_priv *wil)
{
int delay = 0;
u32 hw_state;
@ -395,7 +395,7 @@ static void wil_target_reset(struct wil6210_priv *wil)
if (delay++ > 100) {
wil_err(wil, "Reset not completed, hw_state 0x%08x\n",
hw_state);
return;
return -ETIME;
}
} while (hw_state != HW_MACHINE_BOOT_DONE);
@ -407,6 +407,7 @@ static void wil_target_reset(struct wil6210_priv *wil)
wmb(); /* order is important here */
wil_dbg_misc(wil, "Reset completed in %d ms\n", delay);
return 0;
#undef R
#undef W
@ -471,10 +472,11 @@ int wil_reset(struct wil6210_priv *wil)
flush_workqueue(wil->wmi_wq_conn);
flush_workqueue(wil->wmi_wq);
/* TODO: put MAC in reset */
wil_target_reset(wil);
rc = wil_target_reset(wil);
wil_rx_fini(wil);
if (rc)
return rc;
/* init after reset */
wil->pending_connect_cid = -1;