diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-03-18 07:39:08 +0100 | 
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-03-18 07:39:08 +0100 | 
| commit | d351cf4603edb2a5bfa9a48d06c425511c63f2a3 (patch) | |
| tree | b03ea3cfd3ca3974237563cf87328386c3d49ff1 /sound/pci/atiixp_modem.c | |
| parent | 433e8327caf9f7c0432b2f2f6684a5b79cfe18e9 (diff) | |
| parent | 4a122c10fbfe9020df469f0f669da129c5757671 (diff) | |
| download | olio-linux-3.10-d351cf4603edb2a5bfa9a48d06c425511c63f2a3.tar.xz olio-linux-3.10-d351cf4603edb2a5bfa9a48d06c425511c63f2a3.zip  | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/pci/atiixp_modem.c')
| -rw-r--r-- | sound/pci/atiixp_modem.c | 2 | 
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/atiixp_modem.c b/sound/pci/atiixp_modem.c index 91d7036b641..2f74c2fdf1e 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)  		atiixp_read(chip, CMD);  		msleep(1);  		atiixp_update(chip, CMD, ATI_REG_CMD_AC_RESET, ATI_REG_CMD_AC_RESET); -		if (--timeout) { +		if (!--timeout) {  			snd_printk(KERN_ERR "atiixp-modem: codec reset timeout\n");  			break;  		}  |