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/wm0010.c | |
| parent | 022aa51e3fda0b3c6688defaa859961c11c36ec8 (diff) | |
| parent | bf4edea863c435c302041cf8bb01c8b3ca729449 (diff) | |
| download | linux-108145a60675ebc0e42e7964ee6666096bbf86ce.tar.gz linux-108145a60675ebc0e42e7964ee6666096bbf86ce.tar.bz2 linux-108145a60675ebc0e42e7964ee6666096bbf86ce.zip | |
Merge remote-tracking branch 'asoc/topic/warn' into asoc-next
Diffstat (limited to 'sound/soc/codecs/wm0010.c')
| -rw-r--r-- | sound/soc/codecs/wm0010.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c index d5ebcb00019b..aea916431227 100644 --- a/sound/soc/codecs/wm0010.c +++ b/sound/soc/codecs/wm0010.c @@ -372,7 +372,8 @@ static int wm0010_firmware_load(const char *name, struct snd_soc_codec *codec) offset = 0; dsp = inforec->dsp_target; wm0010->boot_failed = false; - BUG_ON(!list_empty(&xfer_list)); + if (WARN_ON(!list_empty(&xfer_list))) + return -EINVAL; init_completion(&done); /* First record should be INFO */ |