From: Stefan Richter Date: Tue, 7 Dec 2010 18:16:02 +0000 (+0100) Subject: firewire: ohci: fix regression with VIA VT6315, disable MSI X-Git-Tag: v2.6.36.3~137 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df957d477e0b93d1a1f8e87f494af2d9cd5e0bdb;p=thirdparty%2Fkernel%2Fstable.git firewire: ohci: fix regression with VIA VT6315, disable MSI commit af0cdf4947818becfe209610b209315578645ab4 upstream. "VIA Technologies, Inc. VT6315 Series Firewire Controller [1106:3403]" does not generate any interrupts if Message Signaled Interrupts were enabled. This is a regression since kernel 2.6.36 in which MSI support was added to firewire-ohci. Hence blacklist MSI on all VIA controllers. Reported-by: Robin Cook Signed-off-by: Stefan Richter Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c index 7570b71a24538..1d1734f262450 100644 --- a/drivers/firewire/ohci.c +++ b/drivers/firewire/ohci.c @@ -262,7 +262,8 @@ static const struct { {PCI_VENDOR_ID_AL, PCI_ANY_ID, QUIRK_CYCLE_TIMER}, {PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB38X_FW, QUIRK_NO_MSI}, {PCI_VENDOR_ID_NEC, PCI_ANY_ID, QUIRK_CYCLE_TIMER}, - {PCI_VENDOR_ID_VIA, PCI_ANY_ID, QUIRK_CYCLE_TIMER}, + {PCI_VENDOR_ID_VIA, PCI_ANY_ID, QUIRK_CYCLE_TIMER | + QUIRK_NO_MSI}, {PCI_VENDOR_ID_RICOH, PCI_ANY_ID, QUIRK_CYCLE_TIMER}, {PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_UNI_N_FW, QUIRK_BE_HEADERS}, };