summaryrefslogtreecommitdiffstats
path: root/drivers/firewire
diff options
context:
space:
mode:
authorMing Lei <ming.lei@canonical.com>2011-08-31 10:45:46 +0800
committerStefan Richter <stefanr@s5r6.in-berlin.de>2011-09-16 22:22:10 +0200
commitf39aa30d7741f40ad964341e9243dbbd7f8ff057 (patch)
tree420519d678d74d07079efc866249491f5c724030 /drivers/firewire
parentb6fd41e29dea9c6753b1843a77e50433e6123bcb (diff)
downloadblackbird-op-linux-f39aa30d7741f40ad964341e9243dbbd7f8ff057.tar.gz
blackbird-op-linux-f39aa30d7741f40ad964341e9243dbbd7f8ff057.zip
firewire: ohci: add no MSI quirk for O2Micro controller
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> (amended changelog) Cc: <stable@kernel.org>
Diffstat (limited to 'drivers/firewire')
-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 57cd3a406edf..fd7170a9ad2c 100644
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
@@ -290,6 +290,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},
OpenPOWER on IntegriCloud