From: Marcin Ślusarz Date: Fri, 14 Dec 2007 11:52:53 +0000 (+0100) Subject: [ALSA] pcm_lib: fix sparse warning about shadowing 'n' symbol X-Git-Tag: v3.12-rc1~24018^2~192 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=be3e0115e3732d77d357724a394ee465e5d0b872;p=kernel%2Fkernel-generic.git [ALSA] pcm_lib: fix sparse warning about shadowing 'n' symbol pcm_lib: fix sparse warning about shadowing 'n' symbol Signed-off-by: Marcin Ślusarz Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela --- diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index db3d7e9..2d3e70b 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);