diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-08-08 11:12:47 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-08-13 05:46:40 -0400 |
commit | 5e246b850df563224be26f1d409cf66fd6c968df (patch) | |
tree | 970e7faf60b86cb2c489a08ca506075c398165e5 /sound/drivers/vx/vx_hwdep.c | |
parent | da3cec35dd3c31d8706db4bf379372ce70d92118 (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/drivers/vx/vx_hwdep.c')
-rw-r--r-- | sound/drivers/vx/vx_hwdep.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/drivers/vx/vx_hwdep.c b/sound/drivers/vx/vx_hwdep.c index efd22e92bced..8d6362e2d4c9 100644 --- a/sound/drivers/vx/vx_hwdep.c +++ b/sound/drivers/vx/vx_hwdep.c | |||
@@ -141,7 +141,8 @@ static int vx_hwdep_dsp_status(struct snd_hwdep *hw, | |||
141 | }; | 141 | }; |
142 | struct vx_core *vx = hw->private_data; | 142 | struct vx_core *vx = hw->private_data; |
143 | 143 | ||
144 | snd_assert(type_ids[vx->type], return -EINVAL); | 144 | if (snd_BUG_ON(!type_ids[vx->type])) |
145 | return -EINVAL; | ||
145 | strcpy(info->id, type_ids[vx->type]); | 146 | strcpy(info->id, type_ids[vx->type]); |
146 | if (vx_is_pcmcia(vx)) | 147 | if (vx_is_pcmcia(vx)) |
147 | info->num_dsps = 4; | 148 | info->num_dsps = 4; |
@@ -168,7 +169,8 @@ static int vx_hwdep_dsp_load(struct snd_hwdep *hw, | |||
168 | int index, err; | 169 | int index, err; |
169 | struct firmware *fw; | 170 | struct firmware *fw; |
170 | 171 | ||
171 | snd_assert(vx->ops->load_dsp, return -ENXIO); | 172 | if (snd_BUG_ON(!vx->ops->load_dsp)) |
173 | return -ENXIO; | ||
172 | 174 | ||
173 | fw = kmalloc(sizeof(*fw), GFP_KERNEL); | 175 | fw = kmalloc(sizeof(*fw), GFP_KERNEL); |
174 | if (! fw) { | 176 | if (! fw) { |