From f624187549695bd249d7902f0d39acb522f3a6fb Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Sat, 28 Apr 2007 16:52:12 +0200 Subject: [PATCH] --- yaml --- r: 53576 b: refs/heads/master c: d2b46f66b4b342be07a4194bd5e82384d07e470d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mmc/card/queue.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2fc4a138a25b..ccd85c4de362 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3b91e5507cddaca53bccf1524ff11a0ac5c85531 +refs/heads/master: d2b46f66b4b342be07a4194bd5e82384d07e470d diff --git a/trunk/drivers/mmc/card/queue.c b/trunk/drivers/mmc/card/queue.c index aa75ac11a19e..2e77963db334 100644 --- a/trunk/drivers/mmc/card/queue.c +++ b/trunk/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);