From 739d0b0c4d3d979149731065acbb9a417eb9ddeb Mon Sep 17 00:00:00 2001 From: Stefan Richter Date: Fri, 28 Aug 2009 13:26:03 +0200 Subject: [PATCH] --- yaml --- r: 157263 b: refs/heads/master c: 4fe0badd5882c64dc2dcd8893f9b85db63339736 h: refs/heads/master i: 157261: 56e14faa5dde08321c5447ba02fb9748a5dbaf62 157259: c77c06518b9e107bdd8394882818546979671469 157255: 868fc3af1c2fa338d48dd8f2d7720e8aa255b10e 157247: b4b0103beefddaca142f51fe87ec545d6bf218a0 v: v3 --- [refs] | 2 +- trunk/drivers/firewire/ohci.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4c3986ba1ecf..c9b3c9cebb26 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fc383796a8cc5df0a0c8633a16dd2e9528a16a63 +refs/heads/master: 4fe0badd5882c64dc2dcd8893f9b85db63339736 diff --git a/trunk/drivers/firewire/ohci.c b/trunk/drivers/firewire/ohci.c index 3486bc49c177..76b321bb73f9 100644 --- a/trunk/drivers/firewire/ohci.c +++ b/trunk/drivers/firewire/ohci.c @@ -2431,6 +2431,11 @@ static int __devinit pci_probe(struct pci_dev *dev, dev->device == PCI_DEVICE_ID_AGERE_FW643) ohci->use_dualbuffer = false; + /* dual-buffer mode is broken */ + if (dev->vendor == PCI_VENDOR_ID_RICOH && + dev->device == PCI_DEVICE_ID_RICOH_R5C832) + ohci->use_dualbuffer = false; + /* x86-32 currently doesn't use highmem for dma_alloc_coherent */ #if !defined(CONFIG_X86_32) /* dual-buffer mode is broken with descriptor addresses above 2G */