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>

diff --git a/drivers/mmc/card/queue.c b/drivers/mmc/card/queue.c
index aa75ac11a19ec1103b5212d7881fd07cd6756f2e..2e77963db334d1d7b9f513bf5dfdc587772743c6 100644 (file)
--- a/drivers/mmc/card/queue.c
+++ b/drivers/mmc/card/queue.c
@@ -191,6 +191,9 @@ void mmc_cleanup_queue(struct mmc_queue *mq)
        q->queuedata = NULL;
        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 */
        kthread_stop(mq->thread);