diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-11-06 10:07:19 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-07 19:55:21 (GMT) |
| commit | a6ed0608bd289b45a9e42e3b0f33ff55bdac9b0f (patch) | |
| tree | d7af8258734c8a3b84e0bb3dffb573ad2469c297 | |
| parent | 9a743400a032766a2b79c88233ea3f6430a59b86 (diff) | |
| download | linux-a6ed0608bd289b45a9e42e3b0f33ff55bdac9b0f.tar.xz | |
ASoC: Replace BUG() with WARN()
BUG() used in the driver is just to spit the stack trace on buggy
points, not really needed to stop the whole operation. For that
purpose, it'd be more convenient to use WARN() instead with more
error information.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
| -rw-r--r-- | sound/soc/soc-cache.c | 6 | ||||
| -rw-r--r-- | sound/soc/soc-dapm.c | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c index e72f554..223dc06 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 b2949ae..974a4ce 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; } |