Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4fe0badd authored by Stefan Richter's avatar Stefan Richter
Browse files

firewire: ohci: fix Ricoh R5C832, video reception 

In dual-buffer DMA mode, no video frames are ever received from R5C832
by libdc1394.  Fallback to packet-per-buffer DMA works reliably.
http://thread.gmane.org/gmane.linux.kernel.firewire.devel/13393/focus=13476



Reported-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent fc383796

drivers/firewire/ohci.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -2431,6 +2431,11 @@ static int __devinit pci_probe(struct pci_dev *dev, 
	    dev->device == PCI_DEVICE_ID_AGERE_FW643)

	    dev->device == PCI_DEVICE_ID_AGERE_FW643)

		ohci->use_dualbuffer = false;

		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 */

/* x86-32 currently doesn't use highmem for dma_alloc_coherent */

#if !defined(CONFIG_X86_32)

#if !defined(CONFIG_X86_32)

	/* dual-buffer mode is broken with descriptor addresses above 2G */

	/* dual-buffer mode is broken with descriptor addresses above 2G */