diff mbox

[maverick] SRU: mmc: sdhci-pci: add ricoh e822 pci id with device specific quirks

Message ID 20110311134245.GB1636@herton-IdeaPad-Y430
State New
Headers show

Commit Message

Herton Ronaldo Krzesinski March 11, 2011, 1:42 p.m. UTC
On Fri, Mar 11, 2011 at 02:31:54PM +0100, Stefan Bader wrote:
> On 03/11/2011 01:28 PM, Herton Ronaldo Krzesinski wrote:
> > Buglink: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/730820
> > 
> > SRU JUSTIFICATION
> > ==================
> > 
> > EFFECT
> > =======
> > MMC card reader 1180:e822 does not recognize SD/MMC/SDHC cards.
> > 
> > FIX
> > ===
> > Patch adds RICOH pci id 0xe822 pointing to required specific quirks to make it work.
> > 
> > TESTING
> > ========
> > This patch was tested and reported to work in this ticket.
> > 
> Patch looks ok but BugLink should better use http://bugs.launchpad.net/bugs/#
> form as that is more stable (works even if the related packages may change) and
> also less to type.

Updated patch (attached), with shorter buglink.

> 
> ack
> 
> -- 
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
>

Comments

Stefan Bader March 11, 2011, 1:53 p.m. UTC | #1
Thanks. Applied and pushed to maverick master-next
diff mbox

Patch

From 78c78ca6037b5c2a21d52656fceb25e565a9ee4f Mon Sep 17 00:00:00 2001
From: Pablo Castillo <CyberCastle@gmail.com>
Date: Tue, 10 Aug 2010 18:02:01 -0700
Subject: [PATCH] mmc: sdhci-pci: add ricoh e822 pci id with device specific quirks

BugLink: http://bugs.launchpad.net/bugs/730820

The card reader with id 1180:e822 also needs same device specific quirks
as other ricoh card readers.

Signed-off-by: Pablo Castillo <CyberCastle@gmail.com>
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Tested-by: Gregg Lebovitz <gregg@lebovitz.net>
Cc: Maxim Levitsky <maximlevitsky@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

(backport of upstream commit 568133ebda39f7507759a744fa9cf4d5097bad2f)
Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
---
 drivers/mmc/host/sdhci-pci.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
index c53b22d..6b75fa8 100644
--- a/drivers/mmc/host/sdhci-pci.c
+++ b/drivers/mmc/host/sdhci-pci.c
@@ -423,6 +423,14 @@  static const struct pci_device_id pci_ids[] __devinitdata = {
 	},
 
 	{
+		.vendor         = PCI_VENDOR_ID_RICOH,
+		.device         = 0xe822,
+		.subvendor      = PCI_ANY_ID,
+		.subdevice      = PCI_ANY_ID,
+		.driver_data    = (kernel_ulong_t)&sdhci_ricoh_mmc,
+	},
+
+	{
 		.vendor		= PCI_VENDOR_ID_ENE,
 		.device		= PCI_DEVICE_ID_ENE_CB712_SD,
 		.subvendor	= PCI_ANY_ID,
-- 
1.7.1