This is a note to let you know that I've just added the patch titled
ALSA: snd-usb: fix next_packet_size calls for pause case
to the 3.5-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
alsa-snd-usb-fix-next_packet_size-calls-for-pause-case.patch
and it can be found in the queue-3.5 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 8dce30c89113e314d29d3b8f362aadff8087fccb Mon Sep 17 00:00:00 2001
From: Daniel Mack <[email protected]>
Date: Thu, 27 Sep 2012 10:26:01 +0200
Subject: ALSA: snd-usb: fix next_packet_size calls for pause case
From: Daniel Mack <[email protected]>
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 <[email protected]>
Reviewed-by: Takashi Iwai <[email protected]>
Reported-and-tested-by: Christian Tefzer <[email protected]>
[ Taking directly because Takashi is on vacation - Linus ]
Signed-off-by: Linus Torvalds <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
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;
Patches currently in stable-queue which might be from [email protected] are
queue-3.5/alsa-snd-usb-fix-next_packet_size-calls-for-pause-case.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
