---

yaml --- r: 53576 b: refs/heads/master c: d2b46f6 h: refs/heads/master v: v3
git-mirror · May 1, 2007 · f624187 · f624187
1 parent f519e25
commit f624187
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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);