Merge branch 'fixes' into next

2020-09-28 12:17:36 +02:00
parent 94d4c3cffe afd7f30886
commit 21685f9a7d
3 changed files with 7 additions and 1 deletions
--- 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)