Merge tag 'pci-v3.13-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...

[pandora-kernel.git] / sound / mips / ad1843.c

diff --git a/sound/mips/ad1843.c b/sound/mips/ad1843.c
index c624510..5869075 100644 (file)
--- a/sound/mips/ad1843.c
+++ b/sound/mips/ad1843.c
@@ -276,7 +276,7 @@ static void ad1843_write_multi(struct snd_ad1843 *ad1843, int argcount, ...)
                if (reg == -1)
                        reg = fp->reg;
                else
-                       BUG_ON(reg != fp->reg);
+                       WARN_ON(reg != fp->reg);
                m = ((1 << fp->nbits) - 1) << fp->lo_bit;
                mask |= m;
                bits |= (value << fp->lo_bit) & m;