From: Chris Wright Subject: [patch 10/59] Repair snd-usb-usx2y over OHCI Date: Fri, 02 Feb 2007 18:35:14 -0800 Message-ID: <20070203023909.479963000@sous-sol.org> References: <20070203023504.435051000@sous-sol.org> Return-path: Content-Disposition: inline; filename=repair-snd-usb-usx2y-over-ohci.patch Sender: linux-kernel-owner@vger.kernel.org To: linux-kernel@vger.kernel.org, stable@kernel.org, Takashi Iwai Cc: Justin Forbes , Zwane Mwaikambo , Theodore Ts'o , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Karsten Wiese , Matt Savigear , alsa-devel@lists.sourceforge.net, Rui Capela , Karsten Wiese List-Id: alsa-devel@alsa-project.org -stable review patch. If anyone has any objections, please let us know. ------------------ From: Karsten Wiese 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. Signed-off-by: Karsten Wiese Signed-off-by: Chris Wright --- sound/usb/usx2y/usbusx2yaudio.c | 2 +- sound/usb/usx2y/usx2yhwdeppcm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- linux-2.6.19.2.orig/sound/usb/usx2y/usbusx2yaudio.c +++ linux-2.6.19.2/sound/usb/usx2y/usbusx2yaudio.c @@ -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); --- linux-2.6.19.2.orig/sound/usb/usx2y/usx2yhwdeppcm.c +++ linux-2.6.19.2/sound/usb/usx2y/usx2yhwdeppcm.c @@ -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); --