diff options
| author |   Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-11 12:26:03 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-11 12:26:03 -0800 |
| commit | 69de7fc037c8cda6fd20a632d39461bf9d42b927 (patch) | |
| tree | 096e704e8f97079ec5c1edd9d1d99b01cddc920e /drivers/mmc/mmc_queue.c | |
| parent | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 (diff) | |
| parent | AT91 MMC update for 2.6.19 (diff) | |
| download | linux-dev-69de7fc037c8cda6fd20a632d39461bf9d42b927.tar.xz linux-dev-69de7fc037c8cda6fd20a632d39461bf9d42b927.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
AT91 MMC update for 2.6.19
mmc: Change SDHCI iomem error to a warning
mmc: fix "prev->state: 2 != TASK_RUNNING??" problem on SD/MMC card removal
AT91 MMC 5 : Minor cleanups
AT91 MMC 4 : Interrupt handler cleanup
AT91 MMC 3 : Move global mci_clk variable
AT91 MMC 2 : Use platform resources
AT91 MMC 1: Pass host structure.
Diffstat (limited to 'drivers/mmc/mmc_queue.c')
| -rw-r--r-- | drivers/mmc/mmc_queue.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mmc/mmc_queue.c b/drivers/mmc/mmc_queue.c index a17423a4ed8f..3e35a43819fb 100644 --- a/drivers/mmc/mmc_queue.c +++ b/drivers/mmc/mmc_queue.c @@ -78,8 +78,10 @@ static int mmc_queue_thread(void *d) spin_unlock_irq(q->queue_lock); if (!req) { - if (kthread_should_stop()) + if (kthread_should_stop()) { + set_current_state(TASK_RUNNING); break; + } up(&mq->thread_sem); schedule(); down(&mq->thread_sem); |