1 files changed, 3 insertions, 2 deletions

diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c
index 4dfa8dceeabf..3938fb1c203e 100644
--- a/sound/soc/codecs/wm8904.c
+++ b/sound/soc/codecs/wm8904.c
@@ -658,7 +658,8 @@ SOC_SINGLE_TLV("EQ5 Volume", WM8904_EQ6, 0, 24, 0, eq_tlv),
 static int cp_event(struct snd_soc_dapm_widget *w,
                     struct snd_kcontrol *kcontrol, int event)
 {
-        BUG_ON(event != SND_SOC_DAPM_POST_PMU);
+        if (WARN_ON(event != SND_SOC_DAPM_POST_PMU))
+                return -EINVAL;
 
         /* Maximum startup time */
         udelay(500);
@@ -740,7 +741,7 @@ static int out_pga_event(struct snd_soc_dapm_widget *w,
                 dcs_r = 3;
                 break;
         default:
-                BUG();
+                WARN(1, "Invalid reg %d\n", reg);
                 return -EINVAL;
         }