diff options
author | David S. Miller | 2009-03-05 11:06:47 +0100 |
---|---|---|
committer | David S. Miller | 2009-03-05 11:06:47 +0100 |
commit | 508827ff0ac3981d420edac64a70de7f4e304d38 (patch) | |
tree | b0cee8ddef9f0ceab68c388e4ae46b7295eb2cb5 /drivers/mmc/host/sdhci.c | |
parent | sfc: Improve NIC internal error recovery (diff) | |
parent | bonding: Fix device passed into ->ndo_neigh_setup(). (diff) | |
download | kernel-qcow2-linux-508827ff0ac3981d420edac64a70de7f4e304d38.tar.gz kernel-qcow2-linux-508827ff0ac3981d420edac64a70de7f4e304d38.tar.xz kernel-qcow2-linux-508827ff0ac3981d420edac64a70de7f4e304d38.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/tokenring/tmspci.c
drivers/net/ucc_geth_mii.c
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) |