aboutsummaryrefslogtreecommitdiffstats
path: root/sound/parisc
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/parisc
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/parisc')
-rw-r--r--sound/parisc/harmony.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/parisc/harmony.c b/sound/parisc/harmony.c
index 99f5483abf2e..774372fe34ad 100644
--- a/sound/parisc/harmony.c
+++ b/sound/parisc/harmony.c
@@ -868,7 +868,8 @@ snd_harmony_mixer_init(struct snd_harmony *h)
868 struct snd_card *card = h->card; 868 struct snd_card *card = h->card;
869 int idx, err; 869 int idx, err;
870 870
871 snd_assert(h != NULL, return -EINVAL); 871 if (snd_BUG_ON(!h))
872 reutrn -EINVAL;
872 strcpy(card->mixername, "Harmony Gain control interface"); 873 strcpy(card->mixername, "Harmony Gain control interface");
873 874
874 for (idx = 0; idx < HARMONY_CONTROLS; idx++) { 875 for (idx = 0; idx < HARMONY_CONTROLS; idx++) {