Commit be3e0115 authored by Marcin Ślusarz's avatar Marcin Ślusarz Committed by Jaroslav Kysela

[ALSA] pcm_lib: fix sparse warning about shadowing 'n' symbol

pcm_lib: fix sparse warning about shadowing 'n' symbol
Signed-off-by: default avatarMarcin Ślusarz <marcin.slusarz@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent 757d5a75
...@@ -1497,14 +1497,18 @@ void snd_pcm_tick_prepare(struct snd_pcm_substream *substream) ...@@ -1497,14 +1497,18 @@ void snd_pcm_tick_prepare(struct snd_pcm_substream *substream)
avail = snd_pcm_capture_avail(runtime); avail = snd_pcm_capture_avail(runtime);
} }
if (avail < runtime->control->avail_min) { if (avail < runtime->control->avail_min) {
snd_pcm_sframes_t n = runtime->control->avail_min - avail; snd_pcm_sframes_t to_avail_min =
if (n > 0 && frames > (snd_pcm_uframes_t)n) runtime->control->avail_min - avail;
frames = n; if (to_avail_min > 0 &&
frames > (snd_pcm_uframes_t)to_avail_min)
frames = to_avail_min;
} }
if (avail < runtime->buffer_size) { if (avail < runtime->buffer_size) {
snd_pcm_sframes_t n = runtime->buffer_size - avail; snd_pcm_sframes_t to_buffer_size =
if (n > 0 && frames > (snd_pcm_uframes_t)n) runtime->buffer_size - avail;
frames = n; if (to_buffer_size > 0 &&
frames > (snd_pcm_uframes_t)to_buffer_size)
frames = to_buffer_size;
} }
if (frames == ULONG_MAX) { if (frames == ULONG_MAX) {
snd_pcm_tick_set(substream, 0); snd_pcm_tick_set(substream, 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment