Skip to content

Commit

Permalink
[ALSA] sound: riptide.c fix shadowed variable warnings
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Harvey Harrison authored and Takashi Iwai committed Apr 24, 2008
1 parent caba7f7 commit 0cd87b1
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions sound/pci/riptide/riptide.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 0cd87b1

Please sign in to comment.