diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-03-11 09:45:32 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-03-11 09:45:32 -0500 |
| commit | 7e79443ce250776b8477426127acdac15c567f22 (patch) | |
| tree | 25141b63c232b77bc45053e08690a91dd7cb3f9f | |
| parent | 966a7f0dc4de57cf52467968e4244d218a5c3506 (diff) | |
ALSA: atiixp - Fix wrong time-out checks during ac-link reset
The time-out in snd_atiixp_aclink_reset() is wrongly checked, and
it resulted in exiting from the loop at the first iteration.
Reported-by: Amir Shamsuddin <AmirS2+alsa@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | sound/pci/atiixp.c | 2 | ||||
| -rw-r--r-- | sound/pci/atiixp_modem.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/atiixp.c b/sound/pci/atiixp.c index 49d572a7b235..3119cd97a217 100644 --- a/sound/pci/atiixp.c +++ b/sound/pci/atiixp.c | |||
| @@ -522,7 +522,7 @@ static int snd_atiixp_aclink_reset(struct atiixp *chip) | |||
| 522 | atiixp_read(chip, CMD); | 522 | atiixp_read(chip, CMD); |
| 523 | mdelay(1); | 523 | mdelay(1); |
| 524 | atiixp_update(chip, CMD, ATI_REG_CMD_AC_RESET, ATI_REG_CMD_AC_RESET); | 524 | atiixp_update(chip, CMD, ATI_REG_CMD_AC_RESET, ATI_REG_CMD_AC_RESET); |
| 525 | if (--timeout) { | 525 | if (!--timeout) { |
| 526 | snd_printk(KERN_ERR "atiixp: codec reset timeout\n"); | 526 | snd_printk(KERN_ERR "atiixp: codec reset timeout\n"); |
| 527 | break; | 527 | break; |
| 528 | } | 528 | } |
diff --git a/sound/pci/atiixp_modem.c b/sound/pci/atiixp_modem.c index 91d7036b6411..2f74c2fdf1ea 100644 --- a/sound/pci/atiixp_modem.c +++ b/sound/pci/atiixp_modem.c | |||
| @@ -498,7 +498,7 @@ static int snd_atiixp_aclink_reset(struct atiixp_modem *chip) | |||
| 498 | atiixp_read(chip, CMD); | 498 | atiixp_read(chip, CMD); |
| 499 | msleep(1); | 499 | msleep(1); |
| 500 | atiixp_update(chip, CMD, ATI_REG_CMD_AC_RESET, ATI_REG_CMD_AC_RESET); | 500 | atiixp_update(chip, CMD, ATI_REG_CMD_AC_RESET, ATI_REG_CMD_AC_RESET); |
| 501 | if (--timeout) { | 501 | if (!--timeout) { |
| 502 | snd_printk(KERN_ERR "atiixp-modem: codec reset timeout\n"); | 502 | snd_printk(KERN_ERR "atiixp-modem: codec reset timeout\n"); |
| 503 | break; | 503 | break; |
| 504 | } | 504 | } |
