tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge tag 'firewire-fix-vt6315' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394

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

Linus Torvalds 2bdb5eb7 2062afb4

options
unified split
Changed files
+2 -2
drivers
firewire
ohci.c
+2 -2
drivers/firewire/ohci.c
··· 336 336 QUIRK_CYCLE_TIMER | QUIRK_IR_WAKE}, 337 337 338 338 {PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VT6315, 0, 339 - QUIRK_CYCLE_TIMER | QUIRK_NO_MSI}, 339 + QUIRK_CYCLE_TIMER /* FIXME: necessary? */ | QUIRK_NO_MSI}, 340 340 341 341 {PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VT6315, PCI_ANY_ID, 342 - 0}, 342 + QUIRK_NO_MSI}, 343 343 344 344 {PCI_VENDOR_ID_VIA, PCI_ANY_ID, PCI_ANY_ID, 345 345 QUIRK_CYCLE_TIMER | QUIRK_NO_MSI},