]> err.no Git - linux-2.6/commitdiff
[ALSA] sound: riptide.c fix shadowed variable warnings
authorHarvey Harrison <harvey.harrison@gmail.com>
Fri, 29 Feb 2008 10:54:26 +0000 (11:54 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 24 Apr 2008 10:00:18 +0000 (12:00 +0200)
In both cases we are passing around the substream number, use
sub_num for this.
sound/pci/riptide/riptide.c:1633:6: warning: symbol 'index' shadows an earlier one
sound/pci/riptide/riptide.c:121:12: originally declared here
sound/pci/riptide/riptide.c:1673:6: warning: symbol 'index' shadows an earlier one
sound/pci/riptide/riptide.c:121:12: originally declared here

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/riptide/riptide.c

index 9408b1eeec40d551615334250d809d8aaf1acdc2..979f7da641ce28f0bc13e7c98f0664004e9bd5f6 100644 (file)
@@ -1630,14 +1630,14 @@ static int snd_riptide_playback_open(struct snd_pcm_substream *substream)
        struct snd_riptide *chip = snd_pcm_substream_chip(substream);
        struct snd_pcm_runtime *runtime = substream->runtime;
        struct pcmhw *data;
-       int index = substream->number;
+       int sub_num = substream->number;
 
-       chip->playback_substream[index] = substream;
+       chip->playback_substream[sub_num] = substream;
        runtime->hw = snd_riptide_playback;
        data = kzalloc(sizeof(struct pcmhw), GFP_KERNEL);
-       data->paths = lbus_play_paths[index];
-       data->id = play_ids[index];
-       data->source = play_sources[index];
+       data->paths = lbus_play_paths[sub_num];
+       data->id = play_ids[sub_num];
+       data->source = play_sources[sub_num];
        data->intdec[0] = 0xff;
        data->intdec[1] = 0xff;
        data->state = ST_STOP;
@@ -1670,10 +1670,10 @@ static int snd_riptide_playback_close(struct snd_pcm_substream *substream)
 {
        struct snd_riptide *chip = snd_pcm_substream_chip(substream);
        struct pcmhw *data = get_pcmhwdev(substream);
-       int index = substream->number;
+       int sub_num = substream->number;
 
        substream->runtime->private_data = NULL;
-       chip->playback_substream[index] = NULL;
+       chip->playback_substream[sub_num] = NULL;
        kfree(data);
        return 0;
 }