diff options
| author | Kai-Heng Feng <kai.heng.feng@canonical.com> | 2020-09-25 16:49:51 +0800 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2020-09-28 12:16:13 +0200 |
| commit | 62c59a8786e6bb75569cee91dab66e9da3ff4b68 (patch) | |
| tree | 4244bf7dba14ecfe300da986c6e59ba19f39d748 /drivers/memstick | |
| parent | 14801c624066a55139c2c57963eb1b859d0a316a (diff) | |
| download | linux-stable-62c59a8786e6bb75569cee91dab66e9da3ff4b68.tar.gz linux-stable-62c59a8786e6bb75569cee91dab66e9da3ff4b68.tar.bz2 linux-stable-62c59a8786e6bb75569cee91dab66e9da3ff4b68.zip | |
memstick: Skip allocating card when removing host
After commit 6827ca573c03 ("memstick: rtsx_usb_ms: Support runtime power
management"), removing module rtsx_usb_ms will be stuck.
The deadlock is caused by powering on and powering off at the same time,
the former one is when memstick_check() is flushed, and the later is called
by memstick_remove_host().
Soe let's skip allocating card to prevent this issue.
Fixes: 6827ca573c03 ("memstick: rtsx_usb_ms: Support runtime power management")
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Link: https://lore.kernel.org/r/20200925084952.13220-1-kai.heng.feng@canonical.com
Cc: stable@vger.kernel.org
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/memstick')
| -rw-r--r-- | drivers/memstick/core/memstick.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/memstick/core/memstick.c b/drivers/memstick/core/memstick.c index 693ee73eb291..ef03d6fafc5c 100644 --- a/drivers/memstick/core/memstick.c +++ b/drivers/memstick/core/memstick.c @@ -441,6 +441,9 @@ static void memstick_check(struct work_struct *work) } else if (host->card->stop) host->card->stop(host->card); + if (host->removing) + goto out_power_off; + card = memstick_alloc_card(host); if (!card) { @@ -545,6 +548,7 @@ EXPORT_SYMBOL(memstick_add_host); */ void memstick_remove_host(struct memstick_host *host) { + host->removing = 1; flush_workqueue(workqueue); mutex_lock(&host->lock); if (host->card) |