From: Greg KH <gre...@linuxfoundation.org>
3.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Mack <zon...@gmail.com>
commit 8dce30c89113e314d29d3b8f362aadff8087fccb upstream.
Also fix the calls to next_packet_size() for the pause case. This was
missed in 245baf983 ("ALSA: snd-usb: fix calls to next_packet_size").
Signed-off-by: Daniel Mack <zon...@gmail.com>
Reviewed-by: Takashi Iwai <ti...@suse.de>
Reported-and-tested-by: Christian Tefzer <ctref...@gmx.de>
[ Taking directly because Takashi is on vacation - Linus ]
Signed-off-by: Linus Torvalds <torva...@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
sound/usb/endpoint.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
--- a/sound/usb/endpoint.c
+++ b/sound/usb/endpoint.c
@@ -197,7 +197,13 @@ static void prepare_outbound_urb(struct
/* no data provider, so send silence */
unsigned int offs = 0;
for (i = 0; i < ctx->packets; ++i) {
- int counts = ctx->packet_size[i];
+ int counts;
+
+ if (ctx->packet_size[i])
+ counts = ctx->packet_size[i];
+ else
+ counts =
snd_usb_endpoint_next_packet_size(ep);
+
urb->iso_frame_desc[i].offset = offs *
ep->stride;
urb->iso_frame_desc[i].length = counts *
ep->stride;
offs += counts;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
