7 files changed, 26 insertions, 12 deletions

diff --git a/sound/isa/sb/emu8000.c b/sound/isa/sb/emu8000.c
index b35be7d9a9fa..96678d5d3834 100644
--- a/sound/isa/sb/emu8000.c
+++ b/sound/isa/sb/emu8000.c
@@ -1023,7 +1023,8 @@ snd_emu8000_create_mixer(struct snd_card *card, struct snd_emu8000 *emu)
 {
         int i, err = 0;
 
-        snd_assert(emu != NULL && card != NULL, return -EINVAL);
+        if (snd_BUG_ON(!emu || !card))
+                return -EINVAL;
 
         spin_lock_init(&emu->control_lock);
 
diff --git a/sound/isa/sb/emu8000_patch.c b/sound/isa/sb/emu8000_patch.c
index 1be16c9700f0..c99c6078be33 100644
--- a/sound/isa/sb/emu8000_patch.c
+++ b/sound/isa/sb/emu8000_patch.c
@@ -156,7 +156,8 @@ snd_emu8000_sample_new(struct snd_emux *rec, struct snd_sf_sample *sp,
         struct snd_emu8000 *emu;
 
         emu = rec->hw;
-        snd_assert(sp != NULL, return -EINVAL);
+        if (snd_BUG_ON(!sp))
+                return -EINVAL;
 
         if (sp->v.size == 0)
                 return 0;
diff --git a/sound/isa/sb/sb16_csp.c b/sound/isa/sb/sb16_csp.c
index 35f3d7b16536..49037d074c71 100644
--- a/sound/isa/sb/sb16_csp.c
+++ b/sound/isa/sb/sb16_csp.c
@@ -198,7 +198,8 @@ static int snd_sb_csp_ioctl(struct snd_hwdep * hw, struct file *file, unsigned i
         struct snd_sb_csp_start start_info;
         int err;
 
-        snd_assert(p != NULL, return -EINVAL);
+        if (snd_BUG_ON(!p))
+                return -EINVAL;
 
         if (snd_sb_csp_check_version(p))
                 return -ENODEV;
@@ -1046,7 +1047,8 @@ static int snd_sb_qsound_build(struct snd_sb_csp * p)
         struct snd_card *card;
         int err;
 
-        snd_assert(p != NULL, return -EINVAL);
+        if (snd_BUG_ON(!p))
+                return -EINVAL;
 
         card = p->chip->card;
         p->qpos_left = p->qpos_right = SNDRV_SB_CSP_QSOUND_MAX_RIGHT / 2;
@@ -1071,7 +1073,8 @@ static void snd_sb_qsound_destroy(struct snd_sb_csp * p)
         struct snd_card *card;
         unsigned long flags;
 
-        snd_assert(p != NULL, return);
+        if (snd_BUG_ON(!p))
+                return;
 
         card = p->chip->card;   
         
diff --git a/sound/isa/sb/sb16_main.c b/sound/isa/sb/sb16_main.c
index f7e8192270ae..2a6cc1cfe945 100644
--- a/sound/isa/sb/sb16_main.c
+++ b/sound/isa/sb/sb16_main.c
@@ -669,7 +669,8 @@ static int snd_sb16_capture_close(struct snd_pcm_substream *substream)
 static int snd_sb16_set_dma_mode(struct snd_sb *chip, int what)
 {
         if (chip->dma8 < 0 || chip->dma16 < 0) {
-                snd_assert(what == 0, return -EINVAL);
+                if (snd_BUG_ON(what))
+                        return -EINVAL;
                 return 0;
         }
         if (what == 0) {
diff --git a/sound/isa/sb/sb8_main.c b/sound/isa/sb/sb8_main.c
index fe03bb820532..658d55769c9c 100644
--- a/sound/isa/sb/sb8_main.c
+++ b/sound/isa/sb/sb8_main.c
@@ -111,7 +111,9 @@ static int snd_sb8_playback_prepare(struct snd_pcm_substream *substream)
         switch (chip->hardware) {
         case SB_HW_PRO:
                 if (runtime->channels > 1) {
-                        snd_assert(rate == SB8_RATE(11025) || rate == SB8_RATE(22050), return -EINVAL);
+                        if (snd_BUG_ON(rate != SB8_RATE(11025) &&
+                                       rate != SB8_RATE(22050)))
+                                return -EINVAL;
                         chip->playback_format = SB_DSP_HI_OUTPUT_AUTO;
                         break;
                 }
@@ -237,7 +239,9 @@ static int snd_sb8_capture_prepare(struct snd_pcm_substream *substream)
         switch (chip->hardware) {
         case SB_HW_PRO:
                 if (runtime->channels > 1) {
-                        snd_assert(rate == SB8_RATE(11025) || rate == SB8_RATE(22050), return -EINVAL);
+                        if (snd_BUG_ON(rate != SB8_RATE(11025) &&
+                                       rate != SB8_RATE(22050)))
+                                return -EINVAL;
                         chip->capture_format = SB_DSP_HI_INPUT_AUTO;
                         break;
                 }
diff --git a/sound/isa/sb/sb_common.c b/sound/isa/sb/sb_common.c
index b432d9ae874b..27a651502251 100644
--- a/sound/isa/sb/sb_common.c
+++ b/sound/isa/sb/sb_common.c
@@ -219,7 +219,8 @@ int snd_sbdsp_create(struct snd_card *card,
                 .dev_free =     snd_sbdsp_dev_free,
         };
 
-        snd_assert(r_chip != NULL, return -EINVAL);
+        if (snd_BUG_ON(!r_chip))
+                return -EINVAL;
         *r_chip = NULL;
         chip = kzalloc(sizeof(*chip), GFP_KERNEL);
         if (chip == NULL)
diff --git a/sound/isa/sb/sb_mixer.c b/sound/isa/sb/sb_mixer.c
index 73d4572d136b..406a431af91e 100644
--- 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++);
 }