Commit 339e3eb1 authored by Christian Löhle's avatar Christian Löhle Committed by Ulf Hansson
Browse files

mmc: queue: Cancel recovery work on cleanup 



To prevent any recovery work running after the queue cleanup cancel it.
Any recovery running post-cleanup dereferenced mq->card as NULL
and was not meaningful to begin with.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarChristian Loehle <cloehle@hyperstone.com>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Link: https://lore.kernel.org/r/c865c0c9789d428494b67b820a78923e@hyperstone.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 406e1480

drivers/mmc/core/queue.c

+7 −0
Original line number Diff line number Diff line
@@ -493,6 +493,13 @@ void mmc_cleanup_queue(struct mmc_queue *mq) 
	if (blk_queue_quiesced(q))

		blk_mq_unquiesce_queue(q);



	/*

	 * If the recovery completes the last (and only remaining) request in

	 * the queue, and the card has been removed, we could end up here with

	 * the recovery not quite finished yet, so cancel it.

	 */

	cancel_work_sync(&mq->recovery_work);



	blk_mq_free_tag_set(&mq->tag_set);



	/*