From ce8257968bc8c10928ced73b2c84df8b26958d52 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Sat, 28 Jun 2008 18:21:41 +0200 Subject: [PATCH] --- yaml --- r: 102187 b: refs/heads/master c: 93fc48c785f6266e67663b3cbbf24579b53fe5cf h: refs/heads/master i: 102185: a556a35ee255fd11772ca8004ca40db0513c9e4b 102183: f089125462ce2da497f82249658438a3aaec19e9 v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/sdhci-pci.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 794354e39dd9..7db354d4ed8a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0121a9829bf28c65e1a05cc881899c10d82b8de2 +refs/heads/master: 93fc48c785f6266e67663b3cbbf24579b53fe5cf diff --git a/trunk/drivers/mmc/host/sdhci-pci.c b/trunk/drivers/mmc/host/sdhci-pci.c index c0fbf48d9b45..0716dcffd511 100644 --- a/trunk/drivers/mmc/host/sdhci-pci.c +++ b/trunk/drivers/mmc/host/sdhci-pci.c @@ -139,6 +139,12 @@ static int jmicron_probe(struct sdhci_pci_chip *chip) { int ret; + if (chip->pdev->revision == 0) { + chip->quirks |= SDHCI_QUIRK_32BIT_DMA_ADDR | + SDHCI_QUIRK_32BIT_DMA_SIZE | + SDHCI_QUIRK_RESET_AFTER_REQUEST; + } + /* * JMicron chips can have two interfaces to the same hardware * in order to work around limitations in Microsoft's driver. @@ -250,10 +256,6 @@ static int jmicron_resume(struct sdhci_pci_chip *chip) } static const struct sdhci_pci_fixes sdhci_jmicron = { - .quirks = SDHCI_QUIRK_32BIT_DMA_ADDR | - SDHCI_QUIRK_32BIT_DMA_SIZE | - SDHCI_QUIRK_RESET_AFTER_REQUEST, - .probe = jmicron_probe, .probe_slot = jmicron_probe_slot,