aboutsummaryrefslogtreecommitdiffstats
path: root/sound/synth/emux/emux_nrpn.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_nrpn.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_nrpn.c')
-rw-r--r--sound/synth/emux/emux_nrpn.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/synth/emux/emux_nrpn.c b/sound/synth/emux/emux_nrpn.c
index c6917ba2c934..00fc005ecf6e 100644
--- a/sound/synth/emux/emux_nrpn.c
+++ b/sound/synth/emux/emux_nrpn.c
@@ -289,8 +289,8 @@ snd_emux_nrpn(void *p, struct snd_midi_channel *chan,
289 struct snd_emux_port *port; 289 struct snd_emux_port *port;
290 290
291 port = p; 291 port = p;
292 snd_assert(port != NULL, return); 292 if (snd_BUG_ON(!port || !chan))
293 snd_assert(chan != NULL, return); 293 return;
294 294
295 if (chan->control[MIDI_CTL_NONREG_PARM_NUM_MSB] == 127 && 295 if (chan->control[MIDI_CTL_NONREG_PARM_NUM_MSB] == 127 &&
296 chan->control[MIDI_CTL_NONREG_PARM_NUM_LSB] <= 26) { 296 chan->control[MIDI_CTL_NONREG_PARM_NUM_LSB] <= 26) {
@@ -379,8 +379,8 @@ snd_emux_sysex(void *p, unsigned char *buf, int len, int parsed,
379 struct snd_emux *emu; 379 struct snd_emux *emu;
380 380
381 port = p; 381 port = p;
382 snd_assert(port != NULL, return); 382 if (snd_BUG_ON(!port || !chset))
383 snd_assert(chset != NULL, return); 383 return;
384 emu = port->emu; 384 emu = port->emu;
385 385
386 switch (parsed) { 386 switch (parsed) {