diff options
author | James Morris <jmorris@namei.org> | 2008-11-06 07:12:34 +0800 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2008-11-06 07:12:34 +0800 |
commit | e21e696edb498c7f7eed42ba3096f6bbe13927b6 (patch) | |
tree | 73b0bc28e45b0268f05c4b384a17bfb2140a73bc /sound/pci/echoaudio/echoaudio_gml.c | |
parent | 2f99db28af90957271a6448479c3e492ccf7c697 (diff) | |
parent | 75fa67706cce5272bcfc51ed646f2da21f3bdb6e (diff) |
Merge branch 'master' into next
Diffstat (limited to 'sound/pci/echoaudio/echoaudio_gml.c')
-rw-r--r-- | sound/pci/echoaudio/echoaudio_gml.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/pci/echoaudio/echoaudio_gml.c b/sound/pci/echoaudio/echoaudio_gml.c index 3aa37e76eba..afa273330e8 100644 --- a/sound/pci/echoaudio/echoaudio_gml.c +++ b/sound/pci/echoaudio/echoaudio_gml.c @@ -112,9 +112,11 @@ static int set_digital_mode(struct echoaudio *chip, u8 mode) return -EIO; /* All audio channels must be closed before changing the digital mode */ - snd_assert(!chip->pipe_alloc_mask, return -EAGAIN); + if (snd_BUG_ON(chip->pipe_alloc_mask)) + return -EAGAIN; - snd_assert(chip->digital_modes & (1 << mode), return -EINVAL); + if (snd_BUG_ON(!(chip->digital_modes & (1 << mode)))) + return -EINVAL; previous_mode = chip->digital_mode; err = dsp_set_digital_mode(chip, mode); |