diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-08-08 11:11:45 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-08-13 05:46:36 -0400 |
commit | 622207dc31895b4e82c39100db8635d885c795e2 (patch) | |
tree | cbfd03ebe9caa2564924c76f2ca28bc348a68c87 /sound/isa/sb/sb16_csp.c | |
parent | 7eaa943c8ed8e91e05d0f5d0dc7a18e3319b45cf (diff) |
ALSA: Kill snd_assert() in sound/isa/*
Kill snd_assert() in sound/isa/*, 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/isa/sb/sb16_csp.c')
-rw-r--r-- | sound/isa/sb/sb16_csp.c | 9 |
1 files changed, 6 insertions, 3 deletions
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 | |||
198 | struct snd_sb_csp_start start_info; | 198 | struct snd_sb_csp_start start_info; |
199 | int err; | 199 | int err; |
200 | 200 | ||
201 | snd_assert(p != NULL, return -EINVAL); | 201 | if (snd_BUG_ON(!p)) |
202 | return -EINVAL; | ||
202 | 203 | ||
203 | if (snd_sb_csp_check_version(p)) | 204 | if (snd_sb_csp_check_version(p)) |
204 | return -ENODEV; | 205 | return -ENODEV; |
@@ -1046,7 +1047,8 @@ static int snd_sb_qsound_build(struct snd_sb_csp * p) | |||
1046 | struct snd_card *card; | 1047 | struct snd_card *card; |
1047 | int err; | 1048 | int err; |
1048 | 1049 | ||
1049 | snd_assert(p != NULL, return -EINVAL); | 1050 | if (snd_BUG_ON(!p)) |
1051 | return -EINVAL; | ||
1050 | 1052 | ||
1051 | card = p->chip->card; | 1053 | card = p->chip->card; |
1052 | p->qpos_left = p->qpos_right = SNDRV_SB_CSP_QSOUND_MAX_RIGHT / 2; | 1054 | 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) | |||
1071 | struct snd_card *card; | 1073 | struct snd_card *card; |
1072 | unsigned long flags; | 1074 | unsigned long flags; |
1073 | 1075 | ||
1074 | snd_assert(p != NULL, return); | 1076 | if (snd_BUG_ON(!p)) |
1077 | return; | ||
1075 | 1078 | ||
1076 | card = p->chip->card; | 1079 | card = p->chip->card; |
1077 | 1080 | ||