summaryrefslogtreecommitdiffstats
path: root/sound/drivers/opl4/opl4_synth.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-10-11 21:39:35 +0200
committerDavid S. Miller <davem@davemloft.net>2008-10-11 21:39:35 +0200
commit56c5d900dbb8e042bfad035d18433476931d8f93 (patch)
tree00b793965beeef10db03e0ff021d2d965c410759 /sound/drivers/opl4/opl4_synth.c
parentleo: disable cursor when leaving graphics mode (diff)
parentMerge phase #4 (X2APIC, APIC unification, CPU identification unification) of ... (diff)
downloadlinux-56c5d900dbb8e042bfad035d18433476931d8f93.tar.xz
linux-56c5d900dbb8e042bfad035d18433476931d8f93.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts: sound/core/memalloc.c
Diffstat (limited to 'sound/drivers/opl4/opl4_synth.c')
-rw-r--r--sound/drivers/opl4/opl4_synth.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/drivers/opl4/opl4_synth.c b/sound/drivers/opl4/opl4_synth.c
index 74f6e53eae0d..49b9e240915c 100644
--- a/sound/drivers/opl4/opl4_synth.c
+++ b/sound/drivers/opl4/opl4_synth.c
@@ -467,7 +467,7 @@ static struct opl4_voice *snd_opl4_get_voice(struct snd_opl4 *opl4)
if (!list_empty(&opl4->off_voices))
return list_entry(opl4->off_voices.next, struct opl4_voice, list);
/* then get the oldest key-on voice */
- snd_assert(!list_empty(&opl4->on_voices), );
+ snd_BUG_ON(list_empty(&opl4->on_voices));
return list_entry(opl4->on_voices.next, struct opl4_voice, list);
}