ALSA: Kill snd_assert() in sound/isa/*

[linux-2.6-omap-h63xx.git] / sound / isa / sb / sb_mixer.c

diff --git a/sound/isa/sb/sb_mixer.c b/sound/isa/sb/sb_mixer.c
index 73d4572d136bb893da5435ecc97313a52ccb7ba0..406a431af91ec6880d548b39b0f423c9bb01a56b 100644 (file)
--- a/sound/isa/sb/sb_mixer.c
+++ b/sound/isa/sb/sb_mixer.c
@@ -792,7 +792,8 @@ int snd_sbmixer_new(struct snd_sb *chip)
        struct snd_card *card;
        int err;
 
-       snd_assert(chip != NULL && chip->card != NULL, return -EINVAL);
+       if (snd_BUG_ON(!chip || !chip->card))
+               return -EINVAL;
 
        card = chip->card;
 
@@ -925,7 +926,8 @@ static unsigned char als4000_saved_regs[] = {
 static void save_mixer(struct snd_sb *chip, unsigned char *regs, int num_regs)
 {
        unsigned char *val = chip->saved_regs;
-       snd_assert(num_regs <= ARRAY_SIZE(chip->saved_regs), return);
+       if (snd_BUG_ON(num_regs > ARRAY_SIZE(chip->saved_regs)))
+               return;
        for (; num_regs; num_regs--)
                *val++ = snd_sbmixer_read(chip, *regs++);
 }
@@ -933,7 +935,8 @@ static void save_mixer(struct snd_sb *chip, unsigned char *regs, int num_regs)
 static void restore_mixer(struct snd_sb *chip, unsigned char *regs, int num_regs)
 {
        unsigned char *val = chip->saved_regs;
-       snd_assert(num_regs <= ARRAY_SIZE(chip->saved_regs), return);
+       if (snd_BUG_ON(num_regs > ARRAY_SIZE(chip->saved_regs)))
+               return;
        for (; num_regs; num_regs--)
                snd_sbmixer_write(chip, *regs++, *val++);
 }