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/sb8_main.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/sb8_main.c')
-rw-r--r-- | sound/isa/sb/sb8_main.c | 8 |
1 files changed, 6 insertions, 2 deletions
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) | |||
111 | switch (chip->hardware) { | 111 | switch (chip->hardware) { |
112 | case SB_HW_PRO: | 112 | case SB_HW_PRO: |
113 | if (runtime->channels > 1) { | 113 | if (runtime->channels > 1) { |
114 | snd_assert(rate == SB8_RATE(11025) || rate == SB8_RATE(22050), return -EINVAL); | 114 | if (snd_BUG_ON(rate != SB8_RATE(11025) && |
115 | rate != SB8_RATE(22050))) | ||
116 | return -EINVAL; | ||
115 | chip->playback_format = SB_DSP_HI_OUTPUT_AUTO; | 117 | chip->playback_format = SB_DSP_HI_OUTPUT_AUTO; |
116 | break; | 118 | break; |
117 | } | 119 | } |
@@ -237,7 +239,9 @@ static int snd_sb8_capture_prepare(struct snd_pcm_substream *substream) | |||
237 | switch (chip->hardware) { | 239 | switch (chip->hardware) { |
238 | case SB_HW_PRO: | 240 | case SB_HW_PRO: |
239 | if (runtime->channels > 1) { | 241 | if (runtime->channels > 1) { |
240 | snd_assert(rate == SB8_RATE(11025) || rate == SB8_RATE(22050), return -EINVAL); | 242 | if (snd_BUG_ON(rate != SB8_RATE(11025) && |
243 | rate != SB8_RATE(22050))) | ||
244 | return -EINVAL; | ||
241 | chip->capture_format = SB_DSP_HI_INPUT_AUTO; | 245 | chip->capture_format = SB_DSP_HI_INPUT_AUTO; |
242 | break; | 246 | break; |
243 | } | 247 | } |