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

Commit b53d0b91 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa 

* 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa:
  [ALSA] Repair snd-usb-usx2y over OHCI
parents fe6ea1f7 bc6191b1

sound/usb/usx2y/usbusx2yaudio.c

+1 −1
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ static void i_usX2Y_urb_complete(struct urb *urb) 
		usX2Y_error_urb_status(usX2Y, subs, urb);

		return;

	}

	if (likely(urb->start_frame == usX2Y->wait_iso_frame))

	if (likely((urb->start_frame & 0xFFFF) == (usX2Y->wait_iso_frame & 0xFFFF)))

		subs->completed_urb = urb;

	else {

		usX2Y_error_sequence(usX2Y, subs, urb);

sound/usb/usx2y/usx2yhwdeppcm.c

+1 −1
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ static void i_usX2Y_usbpcm_urb_complete(struct urb *urb) 
		usX2Y_error_urb_status(usX2Y, subs, urb);

		return;

	}

	if (likely(urb->start_frame == usX2Y->wait_iso_frame))

	if (likely((urb->start_frame & 0xFFFF) == (usX2Y->wait_iso_frame & 0xFFFF)))

		subs->completed_urb = urb;

	else {

		usX2Y_error_sequence(usX2Y, subs, urb);