sdhci: add no-card-no-reset quirk for Ricoh R5C822/Sony Z11

Card insertion detection is broken without this quirk on a Sony Vaio
Z11, as discussed on linux-mmc here: http://marc.info/?t=125017355000008

Signed-off-by: Chris Ball <cjb@laptop.org>
Tested-by: Norbert Preining <preining@logic.at>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
index 2f15cc17d88743c42eb116811f5c3b0c6f9c9126..63b9d2a6a452a9eb0801d9baaf4980b73a12881f 100644 (file)
--- a/drivers/mmc/host/sdhci-pci.c
+++ b/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;