diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-03-18 02:39:08 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-03-18 02:39:08 -0400 |
commit | d351cf4603edb2a5bfa9a48d06c425511c63f2a3 (patch) | |
tree | b03ea3cfd3ca3974237563cf87328386c3d49ff1 /sound/pci/atiixp.c | |
parent | 433e8327caf9f7c0432b2f2f6684a5b79cfe18e9 (diff) | |
parent | 4a122c10fbfe9020df469f0f669da129c5757671 (diff) |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/pci/atiixp.c')
-rw-r--r-- | sound/pci/atiixp.c | 2 |
1 files changed, 1 insertions, 1 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 | } |