Parcourir la source

mmc: allow suspended block driver to be removed

Make sure we don't deadlock when removing a suspended block
queue, something that might happen if the card is removed during
suspend.

Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Pierre Ossman il y a 18 ans
Parent
commit
d2b46f66b4
1 fichiers modifiés avec 3 ajouts et 0 suppressions
  1. 3 0
      drivers/mmc/card/queue.c

+ 3 - 0
drivers/mmc/card/queue.c

@@ -191,6 +191,9 @@ void mmc_cleanup_queue(struct mmc_queue *mq)
 	q->queuedata = NULL;
 	q->queuedata = NULL;
 	spin_unlock_irqrestore(q->queue_lock, flags);
 	spin_unlock_irqrestore(q->queue_lock, flags);
 
 
+	/* Make sure the queue isn't suspended, as that will deadlock */
+	mmc_queue_resume(mq);
+
 	/* Then terminate our worker thread */
 	/* Then terminate our worker thread */
 	kthread_stop(mq->thread);
 	kthread_stop(mq->thread);