diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-08 10:43:41 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-08 10:43:41 +0000 |
| commit | 108145a60675ebc0e42e7964ee6666096bbf86ce (patch) | |
| tree | 19266ab0500d7bb188eb53634d484054d59473d2 /sound/soc/codecs/wm9713.c | |
| parent | 022aa51e3fda0b3c6688defaa859961c11c36ec8 (diff) | |
| parent | bf4edea863c435c302041cf8bb01c8b3ca729449 (diff) | |
Merge remote-tracking branch 'asoc/topic/warn' into asoc-next
Diffstat (limited to 'sound/soc/codecs/wm9713.c')
| -rw-r--r-- | sound/soc/codecs/wm9713.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c index a53e175c015a..acea8927905b 100644 --- a/sound/soc/codecs/wm9713.c +++ b/sound/soc/codecs/wm9713.c @@ -221,7 +221,8 @@ static int wm9713_voice_shutdown(struct snd_soc_dapm_widget *w, struct snd_soc_codec *codec = w->codec; u16 status, rate; - BUG_ON(event != SND_SOC_DAPM_PRE_PMD); + if (WARN_ON(event != SND_SOC_DAPM_PRE_PMD)) + return -EINVAL; /* Gracefully shut down the voice interface. */ status = ac97_read(codec, AC97_EXTENDED_MID) | 0x1000; |