[ALSA] pcm_lib: fix sparse warning about shadowing 'n' symbol
authorMarcin Ślusarz <marcin.slusarz@gmail.com>
Fri, 14 Dec 2007 11:52:53 +0000 (12:52 +0100)
committerJaroslav Kysela <perex@perex.cz>
Thu, 31 Jan 2008 16:29:35 +0000 (17:29 +0100)
pcm_lib: fix sparse warning about shadowing 'n' symbol

Signed-off-by: Marcin Ślusarz <marcin.slusarz@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
sound/core/pcm_lib.c

index db3d7e934ec3bf1655b0c4ed0a1d1e64e72f0a6d..2d3e70b2fe3e7e8110685c5e76dd0d7b4f2210e0 100644 (file)
@@ -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);