From: Linus Torvalds Date: Thu, 2 Feb 2012 02:30:15 +0000 (-0800) Subject: Merge tag 'firewire-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394... X-Git-Tag: firefly_0821_release~3680^2~3593 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bd3ce7d57c380af110c86d19e256115d0e7053ca;p=firefly-linux-kernel-4.4.55.git Merge tag 'firewire-fixes' of git://git./linux/kernel/git/ieee1394/linux1394 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 --- bd3ce7d57c380af110c86d19e256115d0e7053ca