diff options
Diffstat (limited to 'sound/pci/echoaudio/darla24_dsp.c')
-rw-r--r-- | sound/pci/echoaudio/darla24_dsp.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sound/pci/echoaudio/darla24_dsp.c b/sound/pci/echoaudio/darla24_dsp.c index 79938eed7e9c..60228731841f 100644 --- a/sound/pci/echoaudio/darla24_dsp.c +++ b/sound/pci/echoaudio/darla24_dsp.c | |||
@@ -34,7 +34,8 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id) | |||
34 | int err; | 34 | int err; |
35 | 35 | ||
36 | DE_INIT(("init_hw() - Darla24\n")); | 36 | DE_INIT(("init_hw() - Darla24\n")); |
37 | snd_assert((subdevice_id & 0xfff0) == DARLA24, return -ENODEV); | 37 | if (snd_BUG_ON((subdevice_id & 0xfff0) != DARLA24)) |
38 | return -ENODEV; | ||
38 | 39 | ||
39 | if ((err = init_dsp_comm_page(chip))) { | 40 | if ((err = init_dsp_comm_page(chip))) { |
40 | DE_INIT(("init_hw - could not initialize DSP comm page\n")); | 41 | DE_INIT(("init_hw - could not initialize DSP comm page\n")); |
@@ -148,8 +149,9 @@ static int set_sample_rate(struct echoaudio *chip, u32 rate) | |||
148 | 149 | ||
149 | static int set_input_clock(struct echoaudio *chip, u16 clock) | 150 | static int set_input_clock(struct echoaudio *chip, u16 clock) |
150 | { | 151 | { |
151 | snd_assert(clock == ECHO_CLOCK_INTERNAL || | 152 | if (snd_BUG_ON(clock != ECHO_CLOCK_INTERNAL && |
152 | clock == ECHO_CLOCK_ESYNC, return -EINVAL); | 153 | clock != ECHO_CLOCK_ESYNC)) |
154 | return -EINVAL; | ||
153 | chip->input_clock = clock; | 155 | chip->input_clock = clock; |
154 | return set_sample_rate(chip, chip->sample_rate); | 156 | return set_sample_rate(chip, chip->sample_rate); |
155 | } | 157 | } |