From b6b45061481b82de29ebdd247ff691bd2d561e97 Mon Sep 17 00:00:00 2001 From: Chris Ball Date: Tue, 22 Sep 2009 16:45:22 -0700 Subject: [PATCH] --- yaml --- r: 164749 b: refs/heads/master c: c99436fb7505ca2427780d7ae49ebb427bb6f374 h: refs/heads/master i: 164747: 32a2347977a60eb050ed52f9dd772831e36a7fc0 v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/sdhci-pci.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ba8b1286da31..64813c906dc4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 864f38ebdcb1f7dc4138b7ccb801f16f1696eb8e +refs/heads/master: c99436fb7505ca2427780d7ae49ebb427bb6f374 diff --git a/trunk/drivers/mmc/host/sdhci-pci.c b/trunk/drivers/mmc/host/sdhci-pci.c index 2f15cc17d887..63b9d2a6a452 100644 --- a/trunk/drivers/mmc/host/sdhci-pci.c +++ b/trunk/drivers/mmc/host/sdhci-pci.c @@ -83,7 +83,8 @@ 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) + 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; return 0;