diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2009-01-26 08:08:34 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-01-26 17:05:02 +0100 |
| commit | b7eb4a06e9980973755b7e95a6d97fb8decbf8fd (patch) | |
| tree | a2d43ef6f4f4448b9659c9a9538acfe2e5fec06d /sound | |
| parent | 8693290b9038f32b6b9bafd97b7e18465d62655b (diff) | |
| download | linux-stable-b7eb4a06e9980973755b7e95a6d97fb8decbf8fd.tar.gz linux-stable-b7eb4a06e9980973755b7e95a6d97fb8decbf8fd.tar.bz2 linux-stable-b7eb4a06e9980973755b7e95a6d97fb8decbf8fd.zip | |
sound: usb-audio: use normal number of frames for no-data URBs
When sending a silence URB (before playback has started, or when it is
paused), use the number of frames that would be normally sent instead of
a single frame so that the rate at which completion interrupts arrive is
consistent.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/usb/usbaudio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c index c709b9563226..417d557ed641 100644 --- a/sound/usb/usbaudio.c +++ b/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, |