diff options
| author | Steve French <sfrench@us.ibm.com> | 2009-04-20 15:59:09 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-04-20 15:59:09 -0400 |
| commit | cbb7fe129bb2b836083ebcc256c43faff4b48cc2 (patch) | |
| tree | 65998c06e712be5f7cb72543a7c0cc2d0b1b4459 /sound/pci/emu10k1/io.c | |
| parent | 7b0c8fcff47a885743125dd843db64af41af5a61 (diff) | |
| parent | a939b96cccdb65df80a52447ec8e4a6d79c56dbb (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'sound/pci/emu10k1/io.c')
| -rw-r--r-- | sound/pci/emu10k1/io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/emu10k1/io.c b/sound/pci/emu10k1/io.c index 4bfc31d1b281..c1a5aa15af8f 100644 --- a/sound/pci/emu10k1/io.c +++ b/sound/pci/emu10k1/io.c | |||
| @@ -490,7 +490,7 @@ void snd_emu10k1_wait(struct snd_emu10k1 *emu, unsigned int wait) | |||
| 490 | if (newtime != curtime) | 490 | if (newtime != curtime) |
| 491 | break; | 491 | break; |
| 492 | } | 492 | } |
| 493 | if (count >= 16384) | 493 | if (count > 16384) |
| 494 | break; | 494 | break; |
| 495 | curtime = newtime; | 495 | curtime = newtime; |
| 496 | } | 496 | } |