Commit f746606a authored by Karun Eagalapati's avatar Karun Eagalapati Committed by Kalle Valo

rsi: correct SDIO disconnect path handling

Sometimes it's observed that we get interrupt/Rx frame when device is
already detached from mac80211. In this case couple of error messages
are displayed in dmesg log. This patch corrects the order so that
disconnection will happen cleanly
Signed-off-by: default avatarKarun Eagalapati <karun256@gmail.com>
Signed-off-by: default avatarAmitkumar Karwar <amit.karwar@redpinesignals.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 49ddac0d
...@@ -1026,17 +1026,26 @@ static void rsi_disconnect(struct sdio_func *pfunction) ...@@ -1026,17 +1026,26 @@ static void rsi_disconnect(struct sdio_func *pfunction)
return; return;
dev = (struct rsi_91x_sdiodev *)adapter->rsi_dev; dev = (struct rsi_91x_sdiodev *)adapter->rsi_dev;
sdio_claim_host(pfunction);
sdio_release_irq(pfunction);
sdio_release_host(pfunction);
mdelay(10);
dev->write_fail = 2;
rsi_mac80211_detach(adapter); rsi_mac80211_detach(adapter);
mdelay(10);
sdio_claim_host(pfunction); /* Reset Chip */
sdio_release_irq(pfunction);
sdio_disable_func(pfunction);
rsi_91x_deinit(adapter);
rsi_reset_chip(adapter); rsi_reset_chip(adapter);
/* Resetting to take care of the case, where-in driver is re-loaded */
sdio_claim_host(pfunction);
rsi_reset_card(pfunction); rsi_reset_card(pfunction);
sdio_disable_func(pfunction);
sdio_release_host(pfunction); sdio_release_host(pfunction);
dev->write_fail = 2;
rsi_91x_deinit(adapter);
rsi_dbg(ERR_ZONE, "##### RSI SDIO device disconnected #####\n");
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment