redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

[ALSA] sound: riptide.c fix shadowed variable warnings

Browse source 
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>
This commit is contained in:
Harvey Harrison 2008-02-29 11:54:26 +01:00 committed by Takashi Iwai
parent caba7f70fc
commit 0cd87b10ca
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sound/pci/riptide/riptide.c
View 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_riptide *chip = snd_pcm_substream_chip(substream);
struct snd_pcm_runtime *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
struct pcmhw *data; 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; runtime->hw = snd_riptide_playback;
data = kzalloc(sizeof(struct pcmhw), GFP_KERNEL); data = kzalloc(sizeof(struct pcmhw), GFP_KERNEL);
data->paths = lbus_play_paths[index]; data->paths = lbus_play_paths[sub_num];
data->id = play_ids[index]; data->id = play_ids[sub_num];
data->source = play_sources[index]; data->source = play_sources[sub_num];
data->intdec[0] = 0xff; data->intdec[0] = 0xff;
data->intdec[1] = 0xff; data->intdec[1] = 0xff;
data->state = ST_STOP; 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 snd_riptide *chip = snd_pcm_substream_chip(substream);
struct pcmhw *data = get_pcmhwdev(substream); struct pcmhw *data = get_pcmhwdev(substream);
int index = substream->number; int sub_num = substream->number;
substream->runtime->private_data = NULL; substream->runtime->private_data = NULL;
chip->playback_substream[index] = NULL; chip->playback_substream[sub_num] = NULL;
kfree(data); kfree(data);
return 0; return 0;
} }