diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-26 23:23:24 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-26 23:23:24 +0100 |
| commit | 08abe18af1f78ee80c3c3a5ac47c3e0ae0beadf6 (patch) | |
| tree | 2be39bf8942edca1bcec735145e144a682ca9cd3 /sound/ppc/burgundy.c | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne... (diff) | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | linux-08abe18af1f78ee80c3c3a5ac47c3e0ae0beadf6.tar.xz linux-08abe18af1f78ee80c3c3a5ac47c3e0ae0beadf6.zip | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/net/wimax/i2400m/usb-notif.c
Diffstat (limited to 'sound/ppc/burgundy.c')
| -rw-r--r-- | sound/ppc/burgundy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/ppc/burgundy.c b/sound/ppc/burgundy.c index f860d39af36b..45a76297c38d 100644 --- a/sound/ppc/burgundy.c +++ b/sound/ppc/burgundy.c @@ -35,7 +35,7 @@ snd_pmac_burgundy_busy_wait(struct snd_pmac *chip) int timeout = 50; while ((in_le32(&chip->awacs->codec_ctrl) & MASK_NEWECMD) && timeout--) udelay(1); - if (! timeout) + if (timeout < 0) printk(KERN_DEBUG "burgundy_busy_wait: timeout\n"); } |