From 4d94d556a589ff8bf424d1546a4f05dd230cdd49 Mon Sep 17 00:00:00 2001 From: Clemens Ladisch Date: Mon, 26 Jan 2009 08:08:34 +0100 Subject: [PATCH] --- yaml --- r: 133209 b: refs/heads/master c: b7eb4a06e9980973755b7e95a6d97fb8decbf8fd h: refs/heads/master i: 133207: 9d01c3ad6dd475ee5bf5e05bb2590d119914f12e v: v3 --- [refs] | 2 +- trunk/sound/usb/usbaudio.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e16abd96b76d..8538aa2fb0a5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8693290b9038f32b6b9bafd97b7e18465d62655b +refs/heads/master: b7eb4a06e9980973755b7e95a6d97fb8decbf8fd diff --git a/trunk/sound/usb/usbaudio.c b/trunk/sound/usb/usbaudio.c index c709b9563226..417d557ed641 100644 --- a/trunk/sound/usb/usbaudio.c +++ b/trunk/sound/usb/usbaudio.c @@ -525,7 +525,7 @@ static int snd_usb_audio_next_packet_size(struct snd_usb_substream *subs) /* * Prepare urb for streaming before playback starts or when paused. * - * We don't have any data, so we send a frame of silence. + * We don't have any data, so we send silence. */ static int prepare_nodata_playback_urb(struct snd_usb_substream *subs, struct snd_pcm_runtime *runtime, @@ -537,13 +537,13 @@ static int prepare_nodata_playback_urb(struct snd_usb_substream *subs, offs = 0; urb->dev = ctx->subs->dev; - urb->number_of_packets = subs->packs_per_ms; - for (i = 0; i < subs->packs_per_ms; ++i) { + for (i = 0; i < ctx->packets; ++i) { counts = snd_usb_audio_next_packet_size(subs); urb->iso_frame_desc[i].offset = offs * stride; urb->iso_frame_desc[i].length = counts * stride; offs += counts; } + urb->number_of_packets = ctx->packets; urb->transfer_buffer_length = offs * stride; memset(urb->transfer_buffer, subs->cur_audiofmt->format == SNDRV_PCM_FORMAT_U8 ? 0x80 : 0,