2 files changed, 7 insertions, 5 deletions

diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c
index e72f55428f0b..223dc0636fe5 100644
--- a/sound/soc/soc-cache.c
+++ b/sound/soc/soc-cache.c
@@ -39,7 +39,8 @@ static bool snd_soc_set_cache_val(void *base, unsigned int idx,
                 break;
         }
         default:
-                BUG();
+                WARN(1, "Invalid word_size %d\n", word_size);
+                break;
         }
         return false;
 }
@@ -60,7 +61,8 @@ static unsigned int snd_soc_get_cache_val(const void *base, unsigned int idx,
                 return cache[idx];
         }
         default:
-                BUG();
+                WARN(1, "Invalid word_size %d\n", word_size);
+                break;
         }
         /* unreachable */
         return -1;
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index b2949aed1ac2..974a4ce14239 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -1412,7 +1412,7 @@ static void dapm_seq_check_event(struct snd_soc_card *card,
                 power = 0;
                 break;
         default:
-                BUG();
+                WARN(1, "Unknown event %d\n", event);
                 return;
         }
 
@@ -2001,7 +2001,7 @@ static ssize_t dapm_bias_read_file(struct file *file, char __user *user_buf,
                 level = "Off\n";
                 break;
         default:
-                BUG();
+                WARN(1, "Unknown bias_level %d\n", dapm->bias_level);
                 level = "Unknown\n";
                 break;
         }
@@ -3416,7 +3416,7 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
                 break;
 
         default:
-                BUG();
+                WARN(1, "Unknown event %d\n", event);
                 return -EINVAL;
         }