---

yaml --- r: 157263 b: refs/heads/master c: 4fe0bad h: refs/heads/master i: 157261: 56e14fa 157259: c77c065 157255: 868fc3a 157247: b4b0103 v: v3
git-mirror · Sep 5, 2009 · 739d0b0 · 739d0b0
1 parent fc6ab4e
commit 739d0b0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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 */