From 0f5cb8610d9115da28c2a543eaeb8d0139ae3bf2 Mon Sep 17 00:00:00 2001
From: Daniel Mack <zonque@gmail.com>
Date: Fri, 5 Aug 2011 13:49:52 +0200
Subject: [PATCH] --- yaml --- r: 262943 b: refs/heads/master c:
 15439bde3af7ff88459ea2b5520b77312e958df2 h: refs/heads/master i:   262941:
 cdace1582477ef0c9c075dd2fe8f861ca0d2c0ea   262939:
 04ec00c8d949b52a95f843cc55929af69de8f699   262935:
 387a56219f7fd6b4251cfa04d99d00a089871a38   262927:
 e7f61dc79214324ee74b8a9b51fb3aea76b9d2e5   262911:
 174b992803edc239a54507375a44650791a28383 v: v3

---
 [refs]                        | 2 +-
 trunk/sound/usb/caiaq/audio.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7390e6bba891..1026e101cf90 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5a3973da8b52944bc5909852714e55771c31ce7
+refs/heads/master: 15439bde3af7ff88459ea2b5520b77312e958df2
diff --git a/trunk/sound/usb/caiaq/audio.c b/trunk/sound/usb/caiaq/audio.c
index d0d493ca28ae..aa52b3e13bb5 100644
--- a/trunk/sound/usb/caiaq/audio.c
+++ b/trunk/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);
 	}