Changeset 358 for GPL/branches/uniaud32-2.0/alsa-kernel/pci/fm801.c

Timestamp:

Jul 16, 2008, 11:53:49 AM (17 years ago)

Author:

Paul Smedley

Message:

Update uniaud32-2.0 branch to ALSA 1.0.17

File:

• GPL/branches/uniaud32-2.0/alsa-kernel/pci/fm801.c (modified) (2 diffs)

GPL/branches/uniaud32-2.0/alsa-kernel/pci/fm801.c

@@ -1286 +1286 @@
 static int snd_fm801_chip_init(struct fm801 *chip, int resume)
 {
-        int id;
         unsigned short cmdw;
 
@@ -1311 +1310 @@
                         /* 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;
                                         }