Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[pandora-kernel.git] / sound / pci / echoaudio / echoaudio_gml.c

diff --git a/sound/pci/echoaudio/echoaudio_gml.c b/sound/pci/echoaudio/echoaudio_gml.c
index 3aa37e7..afa2733 100644 (file)
--- 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);