From be3e0115e3732d77d357724a394ee465e5d0b872 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=C5=9Alusarz?= Date: Fri, 14 Dec 2007 12:52:53 +0100 Subject: [ALSA] pcm_lib: fix sparse warning about shadowing 'n' symbol MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit pcm_lib: fix sparse warning about shadowing 'n' symbol Signed-off-by: Marcin Ślusarz Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela --- sound/core/pcm_lib.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'sound/core/pcm_lib.c') diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index db3d7e934ec..2d3e70b2fe3 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -1497,14 +1497,18 @@ void snd_pcm_tick_prepare(struct snd_pcm_substream *substream) avail = snd_pcm_capture_avail(runtime); } if (avail < runtime->control->avail_min) { - snd_pcm_sframes_t n = runtime->control->avail_min - avail; - if (n > 0 && frames > (snd_pcm_uframes_t)n) - frames = n; + snd_pcm_sframes_t to_avail_min = + runtime->control->avail_min - avail; + if (to_avail_min > 0 && + frames > (snd_pcm_uframes_t)to_avail_min) + frames = to_avail_min; } if (avail < runtime->buffer_size) { - snd_pcm_sframes_t n = runtime->buffer_size - avail; - if (n > 0 && frames > (snd_pcm_uframes_t)n) - frames = n; + snd_pcm_sframes_t to_buffer_size = + runtime->buffer_size - avail; + if (to_buffer_size > 0 && + frames > (snd_pcm_uframes_t)to_buffer_size) + frames = to_buffer_size; } if (frames == ULONG_MAX) { snd_pcm_tick_set(substream, 0); -- cgit v1.2.3