public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] ALSA: snd-usb: fix next_packet_size calls for pause case
@ 2012-09-27  8:26 Daniel Mack
  0 siblings, 0 replies; only message in thread
From: Daniel Mack @ 2012-09-27  8:26 UTC (permalink / raw)
  To: torvalds; +Cc: tiwai, linux-kernel, Daniel Mack, stable

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 <zonque@gmail.com>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Reported-and-tested-by: Christian Tefzer <ctrefzer@gmx.de>
Cc: stable@kernel.org
---
Hi Linus,

Takashi is currently on vacation and asked me to contact you directly
for merging this patch for 3.6. FWIW, it's also available here:

git://github.com/zonque/linux.git alsa-for-3.6

Thanks,
Daniel

 sound/usb/endpoint.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c
index a83a18d..d9de667 100644
--- a/sound/usb/endpoint.c
+++ b/sound/usb/endpoint.c
@@ -203,7 +203,13 @@ static void prepare_outbound_urb(struct snd_usb_endpoint *ep,
 			/* 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;
-- 
1.7.11.4


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2012-09-27  8:26 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-27  8:26 [PATCH] ALSA: snd-usb: fix next_packet_size calls for pause case Daniel Mack

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox