leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mwifiex: don't use [delayed_]work_pending()

Browse Source 
Drop work_pending() test from mwifiex_sdio_card_reset().  As
work_pending() becomes %false before sdio_card_reset_worker() starts
executing, it doesn't really protect anything.  reset_host may change
between mmc_remove_host() and mmc_add_host().  Make
sdio_card_reset_worker() cache the target mmc_host so that it isn't
affected by mwifiex_sdio_card_reset() racing with it.

Only compile tested.

Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Bing Zhao <bzhao@marvell.com>
Cc: linux-wireless@vger.kernel.org
This commit is contained in:
Tejun Heo 2012-12-21 17:56:57 -08:00
parent 1cab3f9fcc
commit 7f5855c979
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1752,6 +1752,8 @@ mwifiex_update_mp_end_port(struct mwifiex_adapter *adapter, u16 port)
static struct mmc_host *reset_host; static struct mmc_host *reset_host;
static void sdio_card_reset_worker(struct work_struct *work) static void sdio_card_reset_worker(struct work_struct *work)
{ {
struct mmc_host *target = reset_host;
/* The actual reset operation must be run outside of driver thread. /* The actual reset operation must be run outside of driver thread.
* This is because mmc_remove_host() will cause the device to be * This is because mmc_remove_host() will cause the device to be
* instantly destroyed, and the driver then needs to end its thread, * instantly destroyed, and the driver then needs to end its thread,
@ -1761,10 +1763,10 @@ static void sdio_card_reset_worker(struct work_struct *work)
*/ */
pr_err("Resetting card...\n"); pr_err("Resetting card...\n");
mmc_remove_host(reset_host); mmc_remove_host(target);
/* 20ms delay is based on experiment with sdhci controller */ /* 20ms delay is based on experiment with sdhci controller */
mdelay(20); mdelay(20);
mmc_add_host(reset_host); mmc_add_host(target);
} }
static DECLARE_WORK(card_reset_work, sdio_card_reset_worker); static DECLARE_WORK(card_reset_work, sdio_card_reset_worker);
@ -1773,9 +1775,6 @@ static void mwifiex_sdio_card_reset(struct mwifiex_adapter *adapter)
{ {
struct sdio_mmc_card *card = adapter->card; struct sdio_mmc_card *card = adapter->card;
if (work_pending(&card_reset_work))
return;
reset_host = card->func->card->host; reset_host = card->func->card->host;
schedule_work(&card_reset_work); schedule_work(&card_reset_work);
} }