diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-06 11:47:52 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-06 11:47:52 +0100 |
| commit | 7fc07d84108d54c5b94625c0e168f31b2d66976e (patch) | |
| tree | bebcbcae186108a815de0c1b90e25b1a5fa3852c /drivers/mmc/host/sdhci.c | |
| parent | b67802ea8061393f7bd2d4db934646e76096027c (diff) | |
| parent | 8a0be9ef8225638d26b455788f988c8f84ce9e75 (diff) | |
| download | talos-obmc-linux-7fc07d84108d54c5b94625c0e168f31b2d66976e.tar.gz talos-obmc-linux-7fc07d84108d54c5b94625c0e168f31b2d66976e.zip | |
Merge branch 'sched/core' into sched/cleanups
Diffstat (limited to 'drivers/mmc/host/sdhci.c')
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index f52f3053ed92..accb592764ed 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1291,8 +1291,11 @@ static void sdhci_cmd_irq(struct sdhci_host *host, u32 intmask) if (host->cmd->data) DBG("Cannot wait for busy signal when also " "doing a data transfer"); - else + else if (!(host->quirks & SDHCI_QUIRK_NO_BUSY_IRQ)) return; + + /* The controller does not support the end-of-busy IRQ, + * fall through and take the SDHCI_INT_RESPONSE */ } if (intmask & SDHCI_INT_RESPONSE) |
