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

[linux-2.6-omap-h63xx.git] / sound / pci / mixart / mixart_mixer.c

diff --git a/sound/pci/mixart/mixart_mixer.c b/sound/pci/mixart/mixart_mixer.c
index 6fdda1f70b25d45b718e82bb9a3afc050b15741b..3ba6174c3df1d80a6d714ddc836b751bbf917bc5 100644 (file)
--- a/sound/pci/mixart/mixart_mixer.c
+++ b/sound/pci/mixart/mixart_mixer.c
@@ -837,7 +837,7 @@ static int mixart_pcm_vol_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem
                if(is_aes)      stored_volume = chip->digital_capture_volume[1];        /* AES capture */
                else            stored_volume = chip->digital_capture_volume[0];        /* analog capture */
        } else {
-               snd_assert ( idx < MIXART_PLAYBACK_STREAMS ); 
+               snd_BUG_ON(idx >= MIXART_PLAYBACK_STREAMS);
                if(is_aes)      stored_volume = chip->digital_playback_volume[MIXART_PLAYBACK_STREAMS + idx]; /* AES playback */
                else            stored_volume = chip->digital_playback_volume[idx];     /* analog playback */
        }
@@ -863,7 +863,7 @@ static int mixart_pcm_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem
                else            /* analog capture */
                        stored_volume = chip->digital_capture_volume[0];
        } else {
-               snd_assert ( idx < MIXART_PLAYBACK_STREAMS ); 
+               snd_BUG_ON(idx >= MIXART_PLAYBACK_STREAMS);
                if (is_aes)     /* AES playback */
                        stored_volume = chip->digital_playback_volume[MIXART_PLAYBACK_STREAMS + idx];
                else            /* analog playback */
@@ -909,7 +909,7 @@ static int mixart_pcm_sw_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_
 {
        struct snd_mixart *chip = snd_kcontrol_chip(kcontrol);
        int idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id); /* index */
-       snd_assert ( idx < MIXART_PLAYBACK_STREAMS ); 
+       snd_BUG_ON(idx >= MIXART_PLAYBACK_STREAMS);
        mutex_lock(&chip->mgr->mixer_mutex);
        if(kcontrol->private_value & MIXART_VOL_AES_MASK)       /* AES playback */
                idx += MIXART_PLAYBACK_STREAMS;
@@ -926,7 +926,7 @@ static int mixart_pcm_sw_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_
        int is_aes = kcontrol->private_value & MIXART_VOL_AES_MASK;
        int idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id); /* index */
        int i, j;
-       snd_assert ( idx < MIXART_PLAYBACK_STREAMS ); 
+       snd_BUG_ON(idx >= MIXART_PLAYBACK_STREAMS);
        mutex_lock(&chip->mgr->mixer_mutex);
        j = idx;
        if (is_aes)