aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMing Lei <ming.lei@canonical.com>2011-08-31 10:45:46 +0800
committerGreg Kroah-Hartman <gregkh@suse.de>2011-10-03 11:40:33 -0700
commit3917a8efa50bc38ef2f2194a5e35c2062640feed (patch)
tree7e9bd1999d3298f5511febc66a1f04c63a8667d8
parent2e4caf2e0b5a96f5cfa838108a3a1b934cf7f4f7 (diff)
downloadkernel_samsung_smdk4412-3917a8efa50bc38ef2f2194a5e35c2062640feed.zip
kernel_samsung_smdk4412-3917a8efa50bc38ef2f2194a5e35c2062640feed.tar.gz
kernel_samsung_smdk4412-3917a8efa50bc38ef2f2194a5e35c2062640feed.tar.bz2
firewire: ohci: add no MSI quirk for O2Micro controller
commit f39aa30d7741f40ad964341e9243dbbd7f8ff057 upstream. This fixes https://bugs.launchpad.net/ubuntu/+source/linux/+bug/801719 . An O2Micro PCI Express FireWire controller, "FireWire (IEEE 1394) [0c00]: O2 Micro, Inc. Device [1217:11f7] (rev 05)" which is a combination device together with an SDHCI controller and some sort of storage controller, misses SBP-2 status writes from an attached FireWire HDD. This problem goes away if MSI is disabled for this FireWire controller. The device reportedly does not require QUIRK_CYCLE_TIMER. Signed-off-by: Ming Lei <ming.lei@canonical.com> Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/firewire/ohci.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
index ebb8973..ee76c8e 100644
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
@@ -291,6 +291,9 @@ static const struct {
{PCI_VENDOR_ID_NEC, PCI_ANY_ID, PCI_ANY_ID,
QUIRK_CYCLE_TIMER},
+ {PCI_VENDOR_ID_O2, PCI_ANY_ID, PCI_ANY_ID,
+ QUIRK_NO_MSI},
+
{PCI_VENDOR_ID_RICOH, PCI_ANY_ID, PCI_ANY_ID,
QUIRK_CYCLE_TIMER},