Commit: 8adf76d75e7ed6d30c4aa598bf8ac51de50f3adb - linux_3.x_apsh4a0a (git)

linux-3.0.x for AP-SH4A-0A Board

Commit MetaInfo

• Revision: 8adf76d75e7ed6d30c4aa598bf8ac51de50f3adb (tree)
• Time: 2011-08-18 02:55:53
• Author: Daniel Mack <zonque@gmai...>
• Commiter: Greg Kroah-Hartman

Log Message

ALSA: snd-usb-caiaq: Correct offset fields of outbound iso_frame_desc

commit 15439bde3af7ff88459ea2b5520b77312e958df2 upstream.

This fixes faulty outbount packets in case the inbound packets
received from the hardware are fragmented and contain bogus input
iso frames. The bug has been there for ages, but for some strange
reasons, it was only triggered by newer machines in 64bit mode.

Signed-off-by: Daniel Mack <[e-mail]>
Reported-and-tested-by: William Light <[e-mail]>
Reported-by: Pedro Ribeiro <[e-mail]>
Signed-off-by: Takashi Iwai <[e-mail]>
Signed-off-by: Greg Kroah-Hartman <[e-mail]>

Change Summary

• modified: sound/usb/caiaq/audio.c

Incremental Difference

--- a/sound/usb/caiaq/audio.c
+++ b/sound/usb/caiaq/audio.c
@@ -614,6 +614,7 @@ static void read_completed(struct urb *urb)
 	struct snd_usb_caiaqdev *dev;
 	struct urb *out;
 	int frame, len, send_it = 0, outframe = 0;
+	size_t offset = 0;
 
 	if (urb->status || !info)
 		return;
@@ -634,7 +635,8 @@ static void read_completed(struct urb *urb)
 		len = urb->iso_frame_desc[outframe].actual_length;
 		out->iso_frame_desc[outframe].length = len;
 		out->iso_frame_desc[outframe].actual_length = 0;
-		out->iso_frame_desc[outframe].offset = BYTES_PER_FRAME * frame;
+		out->iso_frame_desc[outframe].offset = offset;
+		offset += len;
 
 		if (len > 0) {
 			spin_lock(&dev->spinlock);
@@ -650,7 +652,7 @@ static void read_completed(struct urb *urb)
 	}
 
 	if (send_it) {
-		out->number_of_packets = FRAMES_PER_URB;
+		out->number_of_packets = outframe;
 		out->transfer_flags = URB_ISO_ASAP;
 		usb_submit_urb(out, GFP_ATOMIC);
 	}