diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-08-08 11:12:14 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-08-13 05:46:38 -0400 |
commit | da3cec35dd3c31d8706db4bf379372ce70d92118 (patch) | |
tree | 9379edebb1c7abc7a7a92ce3be30a35b77d9aa1d /sound/pci/echoaudio/gina24_dsp.c | |
parent | 622207dc31895b4e82c39100db8635d885c795e2 (diff) |
ALSA: Kill snd_assert() in sound/pci/*
Kill snd_assert() in sound/pci/*, 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/pci/echoaudio/gina24_dsp.c')
-rw-r--r-- | sound/pci/echoaudio/gina24_dsp.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sound/pci/echoaudio/gina24_dsp.c b/sound/pci/echoaudio/gina24_dsp.c index 144fc567becf..2fef37a2a5b9 100644 --- a/sound/pci/echoaudio/gina24_dsp.c +++ b/sound/pci/echoaudio/gina24_dsp.c | |||
@@ -43,7 +43,8 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id) | |||
43 | int err; | 43 | int err; |
44 | 44 | ||
45 | DE_INIT(("init_hw() - Gina24\n")); | 45 | DE_INIT(("init_hw() - Gina24\n")); |
46 | snd_assert((subdevice_id & 0xfff0) == GINA24, return -ENODEV); | 46 | if (snd_BUG_ON((subdevice_id & 0xfff0) != GINA24)) |
47 | return -ENODEV; | ||
47 | 48 | ||
48 | if ((err = init_dsp_comm_page(chip))) { | 49 | if ((err = init_dsp_comm_page(chip))) { |
49 | DE_INIT(("init_hw - could not initialize DSP comm page\n")); | 50 | DE_INIT(("init_hw - could not initialize DSP comm page\n")); |
@@ -84,7 +85,8 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id) | |||
84 | if ((err = init_line_levels(chip)) < 0) | 85 | if ((err = init_line_levels(chip)) < 0) |
85 | return err; | 86 | return err; |
86 | err = set_digital_mode(chip, DIGITAL_MODE_SPDIF_RCA); | 87 | err = set_digital_mode(chip, DIGITAL_MODE_SPDIF_RCA); |
87 | snd_assert(err >= 0, return err); | 88 | if (err < 0) |
89 | return err; | ||
88 | err = set_professional_spdif(chip, TRUE); | 90 | err = set_professional_spdif(chip, TRUE); |
89 | 91 | ||
90 | DE_INIT(("init_hw done\n")); | 92 | DE_INIT(("init_hw done\n")); |
@@ -163,8 +165,9 @@ static int set_sample_rate(struct echoaudio *chip, u32 rate) | |||
163 | { | 165 | { |
164 | u32 control_reg, clock; | 166 | u32 control_reg, clock; |
165 | 167 | ||
166 | snd_assert(rate < 50000 || chip->digital_mode != DIGITAL_MODE_ADAT, | 168 | if (snd_BUG_ON(rate >= 50000 && |
167 | return -EINVAL); | 169 | chip->digital_mode == DIGITAL_MODE_ADAT)) |
170 | return -EINVAL; | ||
168 | 171 | ||
169 | /* Only set the clock for internal mode. */ | 172 | /* Only set the clock for internal mode. */ |
170 | if (chip->input_clock != ECHO_CLOCK_INTERNAL) { | 173 | if (chip->input_clock != ECHO_CLOCK_INTERNAL) { |