Commit 69de7fc0 authored by Linus Torvalds's avatar Linus Torvalds

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.
parents 116140b7 99eeb8df
This diff is collapsed.
...@@ -78,8 +78,10 @@ static int mmc_queue_thread(void *d) ...@@ -78,8 +78,10 @@ static int mmc_queue_thread(void *d)
spin_unlock_irq(q->queue_lock); spin_unlock_irq(q->queue_lock);
if (!req) { if (!req) {
if (kthread_should_stop()) if (kthread_should_stop()) {
set_current_state(TASK_RUNNING);
break; break;
}
up(&mq->thread_sem); up(&mq->thread_sem);
schedule(); schedule();
down(&mq->thread_sem); down(&mq->thread_sem);
......
...@@ -1170,8 +1170,8 @@ static int __devinit sdhci_probe_slot(struct pci_dev *pdev, int slot) ...@@ -1170,8 +1170,8 @@ static int __devinit sdhci_probe_slot(struct pci_dev *pdev, int slot)
} }
if (pci_resource_len(pdev, first_bar + slot) != 0x100) { if (pci_resource_len(pdev, first_bar + slot) != 0x100) {
printk(KERN_ERR DRIVER_NAME ": Invalid iomem size. Aborting.\n"); printk(KERN_ERR DRIVER_NAME ": Invalid iomem size. "
return -ENODEV; "You may experience problems.\n");
} }
if ((pdev->class & 0x0000FF) == PCI_SDHCI_IFVENDOR) { if ((pdev->class & 0x0000FF) == PCI_SDHCI_IFVENDOR) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment