Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=be3e0115e3732d77d357724a394ee465e5d0b872
Commit:     be3e0115e3732d77d357724a394ee465e5d0b872
Parent:     757d5a7561842dd89c79d079a3c0935cd49afb9b
Author:     Marcin Ślusarz <[EMAIL PROTECTED]>
AuthorDate: Fri Dec 14 12:52:53 2007 +0100
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Thu Jan 31 17:29:35 2008 +0100

    [ALSA] pcm_lib: fix sparse warning about shadowing 'n' symbol
    
    pcm_lib: fix sparse warning about shadowing 'n' symbol
    
    Signed-off-by: Marcin Ślusarz <[EMAIL PROTECTED]>
    Signed-off-by: Takashi Iwai <[EMAIL PROTECTED]>
    Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 sound/core/pcm_lib.c |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

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);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to