Skip to content

Commit

Permalink
[ALSA] sound: fm801.c fix shadowed variable warning
Browse files Browse the repository at this point in the history
id was only used as a counter in a for loop, move the declaration
to where it is used and change it to i.
sound/pci/fm801.c:1288:6: warning: symbol 'id' shadows an earlier one
sound/pci/fm801.c:51:13: originally declared here

[tiwai - fixed a coding style issue as well]

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 3463d8f commit 58e4334
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions sound/pci/fm801.c
Original file line number Diff line number Diff line change
Expand Up @@ -1285,7 +1285,6 @@ static int wait_for_codec(struct fm801 *chip, unsigned int codec_id,

static int snd_fm801_chip_init(struct fm801 *chip, int resume)
{
int id;
unsigned short cmdw;

if (chip->tea575x_tuner & 0x0010)
Expand All @@ -1310,13 +1309,14 @@ static int snd_fm801_chip_init(struct fm801 *chip, int resume)
} else {
/* my card has the secondary codec */
/* at address #3, so the loop is inverted */
for (id = 3; id > 0; id--) {
if (! wait_for_codec(chip, id, AC97_VENDOR_ID1,
int i;
for (i = 3; i > 0; i--) {
if (!wait_for_codec(chip, i, AC97_VENDOR_ID1,
msecs_to_jiffies(50))) {
cmdw = inw(FM801_REG(chip, AC97_DATA));
if (cmdw != 0xffff && cmdw != 0) {
chip->secondary = 1;
chip->secondary_addr = id;
chip->secondary_addr = i;
break;
}
}
Expand Down

0 comments on commit 58e4334

Please sign in to comment.