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

Commit 8d3de01c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'firewire-update' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394 

Pull firewire fix from Stefan Richter:
 "Work around JMicron initialization quirk, which ffected isochronous
  transmission, e.g. audio via FFADO or ALSA"

* tag 'firewire-update' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
  firewire: ohci: fix JMicron JMB38x IT context discovery
parents 842cf0b9 100ceb66

drivers/firewire/ohci.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -3675,6 +3675,11 @@ static int pci_probe(struct pci_dev *dev, 




	reg_write(ohci, OHCI1394_IsoXmitIntMaskSet, ~0);

	reg_write(ohci, OHCI1394_IsoXmitIntMaskSet, ~0);

	ohci->it_context_support = reg_read(ohci, OHCI1394_IsoXmitIntMaskSet);

	ohci->it_context_support = reg_read(ohci, OHCI1394_IsoXmitIntMaskSet);

	/* JMicron JMB38x often shows 0 at first read, just ignore it */

	if (!ohci->it_context_support) {

		ohci_notice(ohci, "overriding IsoXmitIntMask\n");

		ohci->it_context_support = 0xf;

	}

	reg_write(ohci, OHCI1394_IsoXmitIntMaskClear, ~0);

	reg_write(ohci, OHCI1394_IsoXmitIntMaskClear, ~0);

	ohci->it_context_mask = ohci->it_context_support;

	ohci->it_context_mask = ohci->it_context_support;

	ohci->n_it = hweight32(ohci->it_context_mask);

	ohci->n_it = hweight32(ohci->it_context_mask);