+ sdhci-add-no-card-no-reset-quirk-for-ricoh-r5c822-sony-z11.patch added to -mm tree

+ sdhci-add-no-card-no-reset-quirk-for-ricoh-r5c822-sony-z11.patch added to -mm tree

[akpm]

The patch titled
     sdhci: add no-card-no-reset quirk for Ricoh R5C822/Sony Z11
has been added to the -mm tree.  Its filename is
     sdhci-add-no-card-no-reset-quirk-for-ricoh-r5c822-sony-z11.patch

Before you just go and hit "reply", please:
   a) Consider who else should be cc'ed
   b) Prefer to cc a suitable mailing list as well
   c) Ideally: find the original patch on the mailing list and do a
      reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/SubmitChecklist when testing your code ***

See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: sdhci: add no-card-no-reset quirk for Ricoh R5C822/Sony Z11
From: Chris Ball <cjb@laptop.org>

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>
---

 drivers/mmc/host/sdhci-pci.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff -puN drivers/mmc/host/sdhci-pci.c~sdhci-add-no-card-no-reset-quirk-for-ricoh-r5c822-sony-z11 drivers/mmc/host/sdhci-pci.c
--- a/drivers/mmc/host/sdhci-pci.c~sdhci-add-no-card-no-reset-quirk-for-ricoh-r5c822-sony-z11
+++ a/drivers/mmc/host/sdhci-pci.c
@@ -83,7 +83,8 @@ static int ricoh_probe(struct sdhci_pci_
 	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;
_

Patches currently in -mm which might be from cjb@laptop.org are

sdhci-add-no-card-no-reset-quirk-for-ricoh-r5c822-sony-z11.patch