summaryrefslogtreecommitdiffstats
path: root/drivers/memstick
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2020-09-28 12:17:36 +0200
committerUlf Hansson <ulf.hansson@linaro.org>2020-09-28 12:17:36 +0200
commit21685f9a7d7cdb3f68d83352377571fb24d03134 (patch)
tree73effe4466ee700fa85be940a00bd03785faf6fb /drivers/memstick
parentmmc: sdhci-s3c: hide forward declaration of of_device_id behind CONFIG_OF (diff)
parentmmc: sdhci: Workaround broken command queuing on Intel GLK based IRBIS models (diff)
downloadlinux-21685f9a7d7cdb3f68d83352377571fb24d03134.tar.xz
linux-21685f9a7d7cdb3f68d83352377571fb24d03134.zip
Merge branch 'fixes' into next
Diffstat (limited to 'drivers/memstick')
-rw-r--r--drivers/memstick/core/memstick.c4
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)