18 files changed, 80 insertions, 42 deletions

diff --git a/sound/isa/ad1816a/ad1816a_lib.c b/sound/isa/ad1816a/ad1816a_lib.c
index 4b8dfe2e3dcb..3bfca7c59baf 100644
--- a/sound/isa/ad1816a/ad1816a_lib.c
+++ b/sound/isa/ad1816a/ad1816a_lib.c
@@ -394,7 +394,8 @@ static int snd_ad1816a_timer_open(struct snd_timer *timer)
 
 static unsigned long snd_ad1816a_timer_resolution(struct snd_timer *timer)
 {
-        snd_assert(timer != NULL, return 0);
+        if (snd_BUG_ON(!timer))
+                return 0;
 
         return 10000;
 }
@@ -961,7 +962,8 @@ int __devinit snd_ad1816a_mixer(struct snd_ad1816a *chip)
         unsigned int idx;
         int err;
 
-        snd_assert(chip != NULL && chip->card != NULL, return -EINVAL);
+        if (snd_BUG_ON(!chip || !chip->card))
+                return -EINVAL;
 
         card = chip->card;
 
diff --git a/sound/isa/cs423x/cs4236_lib.c b/sound/isa/cs423x/cs4236_lib.c
index 33e9cf178b8b..6a85fdc53b60 100644
--- a/sound/isa/cs423x/cs4236_lib.c
+++ b/sound/isa/cs423x/cs4236_lib.c
@@ -967,7 +967,8 @@ int snd_cs4236_mixer(struct snd_wss *chip)
         int err;
         struct snd_kcontrol_new *kcontrol;
 
-        snd_assert(chip != NULL && chip->card != NULL, return -EINVAL);
+        if (snd_BUG_ON(!chip || !chip->card))
+                return -EINVAL;
         card = chip->card;
         strcpy(card->mixername, snd_wss_chip_id(chip));
 
diff --git a/sound/isa/es1688/es1688_lib.c b/sound/isa/es1688/es1688_lib.c
index 1e1e575b1db3..4fbb508a817f 100644
--- a/sound/isa/es1688/es1688_lib.c
+++ b/sound/isa/es1688/es1688_lib.c
@@ -1009,7 +1009,8 @@ int snd_es1688_mixer(struct snd_es1688 *chip)
         int err;
         unsigned char reg, val;
 
-        snd_assert(chip != NULL && chip->card != NULL, return -EINVAL);
+        if (snd_BUG_ON(!chip || !chip->card))
+                return -EINVAL;
 
         card = chip->card;
 
diff --git a/sound/isa/gus/gus_main.c b/sound/isa/gus/gus_main.c
index cccc16c8113f..12eb98f2f931 100644
--- a/sound/isa/gus/gus_main.c
+++ b/sound/isa/gus/gus_main.c
@@ -276,9 +276,11 @@ static int snd_gus_init_dma_irq(struct snd_gus_card * gus, int latches)
         static unsigned char dmas[8] =
                 {6, 1, 0, 2, 0, 3, 4, 5};
 
-        snd_assert(gus != NULL, return -EINVAL);
+        if (snd_BUG_ON(!gus))
+                return -EINVAL;
         card = gus->card;
-        snd_assert(card != NULL, return -EINVAL);
+        if (snd_BUG_ON(!card))
+                return -EINVAL;
 
         gus->mix_cntrl_reg &= 0xf8;
         gus->mix_cntrl_reg |= 0x01;     /* disable MIC, LINE IN, enable LINE OUT */
diff --git a/sound/isa/gus/gus_mixer.c b/sound/isa/gus/gus_mixer.c
index ebdb33469306..0dd43414016e 100644
--- a/sound/isa/gus/gus_mixer.c
+++ b/sound/isa/gus/gus_mixer.c
@@ -161,9 +161,11 @@ int snd_gf1_new_mixer(struct snd_gus_card * gus)
         unsigned int idx, max;
         int err;
 
-        snd_assert(gus != NULL, return -EINVAL);
+        if (snd_BUG_ON(!gus))
+                return -EINVAL;
         card = gus->card;
-        snd_assert(card != NULL, return -EINVAL);
+        if (snd_BUG_ON(!card))
+                return -EINVAL;
 
         if (gus->ics_flag)
                 snd_component_add(card, "ICS2101");
diff --git a/sound/isa/gus/gus_pcm.c b/sound/isa/gus/gus_pcm.c
index 99731dc97325..38510aeb21c6 100644
--- a/sound/isa/gus/gus_pcm.c
+++ b/sound/isa/gus/gus_pcm.c
@@ -352,8 +352,10 @@ static int snd_gf1_pcm_playback_copy(struct snd_pcm_substream *substream,
         
         bpos = samples_to_bytes(runtime, pos) + (voice * (pcmp->dma_size / 2));
         len = samples_to_bytes(runtime, count);
-        snd_assert(bpos <= pcmp->dma_size, return -EIO);
-        snd_assert(bpos + len <= pcmp->dma_size, return -EIO);
+        if (snd_BUG_ON(bpos > pcmp->dma_size))
+                return -EIO;
+        if (snd_BUG_ON(bpos + len > pcmp->dma_size))
+                return -EIO;
         if (copy_from_user(runtime->dma_area + bpos, src, len))
                 return -EFAULT;
         if (snd_gf1_pcm_use_dma && len > 32) {
@@ -381,8 +383,10 @@ static int snd_gf1_pcm_playback_silence(struct snd_pcm_substream *substream,
         
         bpos = samples_to_bytes(runtime, pos) + (voice * (pcmp->dma_size / 2));
         len = samples_to_bytes(runtime, count);
-        snd_assert(bpos <= pcmp->dma_size, return -EIO);
-        snd_assert(bpos + len <= pcmp->dma_size, return -EIO);
+        if (snd_BUG_ON(bpos > pcmp->dma_size))
+                return -EIO;
+        if (snd_BUG_ON(bpos + len > pcmp->dma_size))
+                return -EIO;
         snd_pcm_format_set_silence(runtime->format, runtime->dma_area + bpos, count);
         if (snd_gf1_pcm_use_dma && len > 32) {
                 return snd_gf1_pcm_block_change(substream, bpos, pcmp->memory + bpos, len);
diff --git a/sound/isa/opti9xx/miro.c b/sound/isa/opti9xx/miro.c
index 4641daa7844d..440755cc0013 100644
--- a/sound/isa/opti9xx/miro.c
+++ b/sound/isa/opti9xx/miro.c
@@ -675,7 +675,8 @@ static int __devinit snd_miro_mixer(struct snd_miro *miro)
         unsigned int idx;
         int err;
 
-        snd_assert(miro != NULL && miro->card != NULL, return -EINVAL);
+        if (snd_BUG_ON(!miro || !miro->card))
+                return -EINVAL;
 
         card = miro->card;
 
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++);
 }
diff --git a/sound/isa/wavefront/wavefront_fx.c b/sound/isa/wavefront/wavefront_fx.c
index 2efaa7f205aa..dfc449a2194e 100644
--- a/sound/isa/wavefront/wavefront_fx.c
+++ b/sound/isa/wavefront/wavefront_fx.c
@@ -180,11 +180,11 @@ snd_wavefront_fx_ioctl (struct snd_hwdep *sdev, struct file *file,
         unsigned short *pd;
         int err = 0;
 
-        snd_assert(sdev->card != NULL, return -ENODEV);
-        
         card = sdev->card;
-
-        snd_assert(card->private_data != NULL, return -ENODEV);
+        if (snd_BUG_ON(!card))
+                return -ENODEV;
+        if (snd_BUG_ON(!card->private_data))
+                return -ENODEV;
 
         acard = card->private_data;
         dev = &acard->wavefront;
diff --git a/sound/isa/wavefront/wavefront_midi.c b/sound/isa/wavefront/wavefront_midi.c
index a33384a55b0f..f14a7c0b6998 100644
--- a/sound/isa/wavefront/wavefront_midi.c
+++ b/sound/isa/wavefront/wavefront_midi.c
@@ -235,8 +235,10 @@ static int snd_wavefront_midi_input_open(struct snd_rawmidi_substream *substream
         snd_wavefront_midi_t *midi;
         snd_wavefront_mpu_id mpu;
 
-        snd_assert(substream != NULL && substream->rmidi != NULL, return -EIO);
-        snd_assert(substream->rmidi->private_data != NULL, return -EIO);
+        if (snd_BUG_ON(!substream || !substream->rmidi))
+                return -ENXIO;
+        if (snd_BUG_ON(!substream->rmidi->private_data))
+                return -ENXIO;
 
         mpu = *((snd_wavefront_mpu_id *) substream->rmidi->private_data);
 
@@ -257,8 +259,10 @@ static int snd_wavefront_midi_output_open(struct snd_rawmidi_substream *substrea
         snd_wavefront_midi_t *midi;
         snd_wavefront_mpu_id mpu;
 
-        snd_assert(substream != NULL && substream->rmidi != NULL, return -EIO);
-        snd_assert(substream->rmidi->private_data != NULL, return -EIO);
+        if (snd_BUG_ON(!substream || !substream->rmidi))
+                return -ENXIO;
+        if (snd_BUG_ON(!substream->rmidi->private_data))
+                return -ENXIO;
 
         mpu = *((snd_wavefront_mpu_id *) substream->rmidi->private_data);
 
@@ -279,8 +283,10 @@ static int snd_wavefront_midi_input_close(struct snd_rawmidi_substream *substrea
         snd_wavefront_midi_t *midi;
         snd_wavefront_mpu_id mpu;
 
-        snd_assert(substream != NULL && substream->rmidi != NULL, return -EIO);
-        snd_assert(substream->rmidi->private_data != NULL, return -EIO);
+        if (snd_BUG_ON(!substream || !substream->rmidi))
+                return -ENXIO;
+        if (snd_BUG_ON(!substream->rmidi->private_data))
+                return -ENXIO;
 
         mpu = *((snd_wavefront_mpu_id *) substream->rmidi->private_data);
 
@@ -300,8 +306,10 @@ static int snd_wavefront_midi_output_close(struct snd_rawmidi_substream *substre
         snd_wavefront_midi_t *midi;
         snd_wavefront_mpu_id mpu;
 
-        snd_assert(substream != NULL && substream->rmidi != NULL, return -EIO);
-        snd_assert(substream->rmidi->private_data != NULL, return -EIO);
+        if (snd_BUG_ON(!substream || !substream->rmidi))
+                return -ENXIO;
+        if (snd_BUG_ON(!substream->rmidi->private_data))
+                return -ENXIO;
 
         mpu = *((snd_wavefront_mpu_id *) substream->rmidi->private_data);
 
diff --git a/sound/isa/wavefront/wavefront_synth.c b/sound/isa/wavefront/wavefront_synth.c
index 0bb9b9256601..4c410820a994 100644
--- a/sound/isa/wavefront/wavefront_synth.c
+++ b/sound/isa/wavefront/wavefront_synth.c
@@ -1648,9 +1648,10 @@ snd_wavefront_synth_ioctl (struct snd_hwdep *hw, struct file *file,
 
         card = (struct snd_card *) hw->card;
 
-        snd_assert(card != NULL, return -ENODEV);
-
-        snd_assert(card->private_data != NULL, return -ENODEV);
+        if (snd_BUG_ON(!card))
+                return -ENODEV;
+        if (snd_BUG_ON(!card->private_data))
+                return -ENODEV;
 
         acard = card->private_data;
         dev = &acard->wavefront;
diff --git a/sound/isa/wss/wss_lib.c b/sound/isa/wss/wss_lib.c
index 6b7a0fc6f71d..c5beec65936d 100644
--- a/sound/isa/wss/wss_lib.c
+++ b/sound/isa/wss/wss_lib.c
@@ -1946,7 +1946,8 @@ static int snd_wss_info_mux(struct snd_kcontrol *kcontrol,
         char **ptexts = texts;
         struct snd_wss *chip = snd_kcontrol_chip(kcontrol);
 
-        snd_assert(chip->card != NULL, return -EINVAL);
+        if (snd_BUG_ON(!chip->card))
+                return -EINVAL;
         uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
         uinfo->count = 2;
         uinfo->value.enumerated.items = 4;
@@ -2262,7 +2263,8 @@ int snd_wss_mixer(struct snd_wss *chip)
         unsigned int idx;
         int err;
 
-        snd_assert(chip != NULL && chip->pcm != NULL, return -EINVAL);
+        if (snd_BUG_ON(!chip || !chip->pcm))
+                return -EINVAL;
 
         card = chip->card;