aboutsummaryrefslogtreecommitdiffstats
path: root/sound/synth/emux/emux.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-08-08 11:12:47 -0400
committerJaroslav Kysela <perex@perex.cz>2008-08-13 05:46:40 -0400
commit5e246b850df563224be26f1d409cf66fd6c968df (patch)
tree970e7faf60b86cb2c489a08ca506075c398165e5 /sound/synth/emux/emux.c
parentda3cec35dd3c31d8706db4bf379372ce70d92118 (diff)
ALSA: Kill snd_assert() in other places
Kill snd_assert() in other places, either removed or replaced with if () with snd_BUG_ON(). Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/synth/emux/emux.c')
-rw-r--r--sound/synth/emux/emux.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/synth/emux/emux.c b/sound/synth/emux/emux.c
index c89d2ea594b9..f16a3fce4597 100644
--- a/sound/synth/emux/emux.c
+++ b/sound/synth/emux/emux.c
@@ -93,10 +93,10 @@ int snd_emux_register(struct snd_emux *emu, struct snd_card *card, int index, ch
93 int err; 93 int err;
94 struct snd_sf_callback sf_cb; 94 struct snd_sf_callback sf_cb;
95 95
96 snd_assert(emu->hw != NULL, return -EINVAL); 96 if (snd_BUG_ON(!emu->hw || emu->max_voices <= 0))
97 snd_assert(emu->max_voices > 0, return -EINVAL); 97 return -EINVAL;
98 snd_assert(card != NULL, return -EINVAL); 98 if (snd_BUG_ON(!card || !name))
99 snd_assert(name != NULL, return -EINVAL); 99 return -EINVAL;
100 100
101 emu->card = card; 101 emu->card = card;
102 emu->name = kstrdup(name, GFP_KERNEL); 102 emu->name = kstrdup(name, GFP_KERNEL);