From 51125ef424a935d13c30bd53f289a422ed44c53d Mon Sep 17 00:00:00 2001 From: Stefan Richter Date: Sun, 29 Jan 2012 12:41:15 +0100 Subject: [PATCH] --- yaml --- r: 287125 b: refs/heads/master c: 320cfa6ce0b3dc794fedfa4bae54c0f65077234d h: refs/heads/master i: 287123: ab14488c3668011e980a8c9f036e95979f769711 v: v3 --- [refs] | 2 +- trunk/drivers/firewire/ohci.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bb921cee424c..7525ed03c507 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1bb399ad03c11e792f6dea198d3b1e23061f094 +refs/heads/master: 320cfa6ce0b3dc794fedfa4bae54c0f65077234d diff --git a/trunk/drivers/firewire/ohci.c b/trunk/drivers/firewire/ohci.c index 21250eca28d1..7f5f0da726da 100644 --- a/trunk/drivers/firewire/ohci.c +++ b/trunk/drivers/firewire/ohci.c @@ -303,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},