Merge tag 'firewire-fix-vt6315' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394 (2bdb5eb7) · Commits · 戴 / test

Pull firewire regression fix from Stefan Richter: "IEEE 1394 (FireWire) subsystem fix: MSI don't work on VIA PCIe controllers with some isochronous workloads (regression since v3.16-rc1)" * tag 'firewire-fix-vt6315' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394: firewire: ohci: disable MSI for VIA VT6315 again

drivers/firewire/ohci.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -336,10 +336,10 @@ static const struct {
	QUIRK_CYCLE_TIMER \| QUIRK_IR_WAKE},		QUIRK_CYCLE_TIMER \| QUIRK_IR_WAKE},

	{PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VT6315, 0,		{PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VT6315, 0,
	QUIRK_CYCLE_TIMER \| QUIRK_NO_MSI},		QUIRK_CYCLE_TIMER /* FIXME: necessary? */ \| QUIRK_NO_MSI},

	{PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VT6315, PCI_ANY_ID,		{PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VT6315, PCI_ANY_ID,
	0},		QUIRK_NO_MSI},

	{PCI_VENDOR_ID_VIA, PCI_ANY_ID, PCI_ANY_ID,		{PCI_VENDOR_ID_VIA, PCI_ANY_ID, PCI_ANY_ID,
	QUIRK_CYCLE_TIMER \| QUIRK_NO_MSI},		QUIRK_CYCLE_TIMER \| QUIRK_NO_MSI},

Admin message