Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[uclinux-h8/linux.git] / drivers / mmc / host / sdhci-pci-core.c

diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c
index df3b8ec..62aa5d0 100644 (file)
--- a/drivers/mmc/host/sdhci-pci-core.c
+++ b/drivers/mmc/host/sdhci-pci-core.c
@@ -1302,7 +1302,6 @@ static int sdhci_pci_enable_dma(struct sdhci_host *host)
 {
        struct sdhci_pci_slot *slot;
        struct pci_dev *pdev;
-       int ret = -1;
 
        slot = sdhci_priv(host);
        pdev = slot->chip->pdev;
@@ -1314,20 +1313,6 @@ static int sdhci_pci_enable_dma(struct sdhci_host *host)
                        "doesn't fully claim to support it.\n");
        }
 
-       if (host->flags & SDHCI_USE_64_BIT_DMA) {
-               if (host->quirks2 & SDHCI_QUIRK2_BROKEN_64_BIT_DMA) {
-                       host->flags &= ~SDHCI_USE_64_BIT_DMA;
-               } else {
-                       ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));
-                       if (ret)
-                               dev_warn(&pdev->dev, "Failed to set 64-bit DMA mask\n");
-               }
-       }
-       if (ret)
-               ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
-       if (ret)
-               return ret;
-
        pci_set_master(pdev);
 
        return 0;