Merge tag 'firewire-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394 (bd3ce7d5) · Commits · 戴 / test

firewire fixes post v3.3-rc1 Add workarounds table entries for hardware bugs in - FireWire part of Sound Blaster Audigy cards, - Ricoh PCIe 1394 controllers. Without these, several protocols, e.g. AV/C, do not work on the Audigy, and the Ricoh PCIe controllers wouldn't work at all. This does not concern the older Ricoh PCI controllers. * tag 'firewire-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394: firewire: ohci: disable MSI on Ricoh controllers firewire: ohci: add reset packet quirk for SB Audigy

drivers/firewire/ohci.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -263,6 +263,7 @@ static inline struct fw_ohci fw_ohci(struct fw_card card)
		static char ohci_driver_name[] = KBUILD_MODNAME;

		#define PCI_DEVICE_ID_AGERE_FW643 0x5901
		#define PCI_DEVICE_ID_CREATIVE_SB1394 0x4001
		#define PCI_DEVICE_ID_JMICRON_JMB38X_FW 0x2380
		#define PCI_DEVICE_ID_TI_TSB12LV22 0x8009
		#define PCI_DEVICE_ID_TI_TSB12LV26 0x8020
		@@ -289,6 +290,9 @@ static const struct {
		{PCI_VENDOR_ID_ATT, PCI_DEVICE_ID_AGERE_FW643, 6,
		QUIRK_NO_MSI},

		{PCI_VENDOR_ID_CREATIVE, PCI_DEVICE_ID_CREATIVE_SB1394, PCI_ANY_ID,
		QUIRK_RESET_PACKET},

		{PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB38X_FW, PCI_ANY_ID,
		QUIRK_NO_MSI},

		@@ -299,7 +303,7 @@ static const struct {
		QUIRK_NO_MSI},

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

		{PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_TSB12LV22, PCI_ANY_ID,
		QUIRK_CYCLE_TIMER \| QUIRK_RESET_PACKET \| QUIRK_NO_1394A},

Admin message