Skip to contentSkip to conversation

Repair snd-usb-usx2y over OHCI

PATCH New Karsten Wiese 1 participant 1 message Jan 10, 2007 Sound

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Repair snd-usb-usx2y over OHCI

Hi Takashi,

I messed up OHCI support; Rui and Matt confirmed that this fixes it. Do you also need an alsa-driver patch?

kind regards
Karsten

------------------------------------------------------------------------
Subject: Repair snd-usb-usx2y over OHCI
From: Karsten Wiese <[email protected]>

The previous patch "Repair snd-usb-usx2y for usb 2.6.18" assumed urb->start_frame roll over beyond MAX_INT for both UHCI & OHCI. This isn't true until now (kernel 2.6.20).
Fix this by only looking at the common between OHCI & UHCI Frame number range.
This is for mainline and stable kernels >= 2.6.18.

sound/usb/usx2y/usbusx2yaudio.c +1 -1
@@ -322,7 +322,7 @@ static void i_usX2Y_urb_complete(struct 
 		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
@@ -243,7 +243,7 @@ static void i_usX2Y_usbpcm_urb_complete(
 		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);

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV