Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-27 13:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

mwifiex: restore current SDIO write port in failure cases

Browse Source 
During SDIO MP aggregation, we at first acquire current write
port to write data onto and then proceed with using this port
for SDIO write. If error occurs later in mwifiex_write_data_sync
because device is suspended or SDIO write failure, we do not
restore current write port and write bitmap. This results into
leaking one port and hole in SDIO write port bitmap.
Restore current write port and reset bitmap accordingly in
failure cases to avoid this.

Reported-by: James Cameron <quozl@laptop.org>
Signed-off-by: Avinash Patil <patila@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Reviewed-by: James Cameron <quozl@laptop.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Avinash Patil 2014-05-13 19:49:42 -07:00 committed by John W. Linville
parent 89ce4f65f4
commit bb71d01a42
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/wireless/mwifiex/sdio.c
View File

@ -1678,8 +1678,12 @@ static int mwifiex_sdio_host_to_card(struct mwifiex_adapter *adapter,
if (ret) { if (ret) {
if (type == MWIFIEX_TYPE_CMD) if (type == MWIFIEX_TYPE_CMD)
adapter->cmd_sent = false; adapter->cmd_sent = false;
if (type == MWIFIEX_TYPE_DATA) if (type == MWIFIEX_TYPE_DATA) {
adapter->data_sent = false; adapter->data_sent = false;
/* restore curr_wr_port in error cases */
card->curr_wr_port = port;
card->mp_wr_bitmap |= (u32)(1 << card->curr_wr_port);
}
} else { } else {
if (type == MWIFIEX_TYPE_DATA) { if (type == MWIFIEX_TYPE_DATA) {
if (!(card->mp_wr_bitmap & (1 << card->curr_wr_port))) if (!(card->mp_wr_bitmap & (1 << card->curr_wr_port)))