summaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-02-29 11:54:26 +0100
committerTakashi Iwai <tiwai@suse.de>2008-04-24 12:00:18 +0200
commit0cd87b10ca29a351c61c8c63761ab8fb48e47b2f (patch)
treed263f7a9fa1fad306adb1a5585a24157ba416884 /sound/pci
parent[ALSA] sound: pcxhr_core.c fix shadowed variable warning (diff)
downloadlinux-0cd87b10ca29a351c61c8c63761ab8fb48e47b2f.tar.xz
linux-0cd87b10ca29a351c61c8c63761ab8fb48e47b2f.zip
[ALSA] sound: riptide.c fix shadowed variable warnings
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>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/riptide/riptide.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c
index 9408b1eeec40..979f7da641ce 100644
--- a/sound/pci/riptide/riptide.c
+++ b/sound/pci/riptide/riptide.c
@@ -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;
}