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 aa75ac1..2e77963 100644
--- a/drivers/mmc/card/queue.c
+++ b/drivers/mmc/card/queue.c
@@ -191,6 +191,9 @@
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);
