Messages in this thread Patch in this message | | | Date | Sat, 17 Sep 2011 19:40:24 +0200 | From | Stefan Richter <> | Subject | [git pull] FireWire fix |
| |
Linus, please pull from the fixes branch at
git://git.user.in-berlin.de/s5r6/linux1394.git fixes
to receive a hardware quirks flag. Thanks.
Ming Lei (1): firewire: ohci: add no MSI quirk for O2Micro controller
drivers/firewire/ohci.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
commit f39aa30d7741f40ad964341e9243dbbd7f8ff057 Author: Ming Lei <ming.lei@canonical.com> Date: Wed Aug 31 10:45:46 2011 +0800
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>
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c index 57cd3a4..fd7170a 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}, -- Stefan Richter -=====-==-== =--= =---= http://arcgraph.de/sr/
| |