From 4763df1f49b0d6879774946d6d729402aa617d3f Mon Sep 17 00:00:00 2001 From: Vasily Khoruzhick Date: Fri, 5 Mar 2010 13:43:46 -0800 Subject: [PATCH] --- yaml --- r: 186299 b: refs/heads/master c: 849382948992cc6482c778b1e854c19368b60c05 h: refs/heads/master i: 186297: f682dd2b31a748d946c340b8f5204b21e0812703 186295: 339279745db1776ab98d4cae01e8c3f4a28644a4 v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/sdhci-pci.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 3b9d83198c46..3cc34da31e52 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 752993ef8e40d1863b26c7dc51e12223588d0fe0 +refs/heads/master: 849382948992cc6482c778b1e854c19368b60c05 diff --git a/trunk/drivers/mmc/host/sdhci-pci.c b/trunk/drivers/mmc/host/sdhci-pci.c index dbf054315fe2..8e1020cf73f4 100644 --- a/trunk/drivers/mmc/host/sdhci-pci.c +++ b/trunk/drivers/mmc/host/sdhci-pci.c @@ -80,9 +80,6 @@ struct sdhci_pci_chip { static int ricoh_probe(struct sdhci_pci_chip *chip) { - if (chip->pdev->subsystem_vendor == PCI_VENDOR_ID_IBM) - chip->quirks |= SDHCI_QUIRK_CLOCK_BEFORE_RESET; - if (chip->pdev->subsystem_vendor == PCI_VENDOR_ID_SAMSUNG || chip->pdev->subsystem_vendor == PCI_VENDOR_ID_SONY) chip->quirks |= SDHCI_QUIRK_NO_CARD_NO_RESET; @@ -92,7 +89,9 @@ static int ricoh_probe(struct sdhci_pci_chip *chip) static const struct sdhci_pci_fixes sdhci_ricoh = { .probe = ricoh_probe, - .quirks = SDHCI_QUIRK_32BIT_DMA_ADDR, + .quirks = SDHCI_QUIRK_32BIT_DMA_ADDR | + SDHCI_QUIRK_FORCE_DMA | + SDHCI_QUIRK_CLOCK_BEFORE_RESET, }; static const struct sdhci_pci_fixes sdhci_ene_712 = {