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/wss | |
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/wss')
-rw-r--r-- | sound/isa/wss/wss_lib.c | 6 |
1 files changed, 4 insertions, 2 deletions
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, | |||
1946 | char **ptexts = texts; | 1946 | char **ptexts = texts; |
1947 | struct snd_wss *chip = snd_kcontrol_chip(kcontrol); | 1947 | struct snd_wss *chip = snd_kcontrol_chip(kcontrol); |
1948 | 1948 | ||
1949 | snd_assert(chip->card != NULL, return -EINVAL); | 1949 | if (snd_BUG_ON(!chip->card)) |
1950 | return -EINVAL; | ||
1950 | uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; | 1951 | uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; |
1951 | uinfo->count = 2; | 1952 | uinfo->count = 2; |
1952 | uinfo->value.enumerated.items = 4; | 1953 | uinfo->value.enumerated.items = 4; |
@@ -2262,7 +2263,8 @@ int snd_wss_mixer(struct snd_wss *chip) | |||
2262 | unsigned int idx; | 2263 | unsigned int idx; |
2263 | int err; | 2264 | int err; |
2264 | 2265 | ||
2265 | snd_assert(chip != NULL && chip->pcm != NULL, return -EINVAL); | 2266 | if (snd_BUG_ON(!chip || !chip->pcm)) |
2267 | return -EINVAL; | ||
2266 | 2268 | ||
2267 | card = chip->card; | 2269 | card = chip->card; |
2268 | 2270 | ||