diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-08 05:43:41 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-08 05:43:41 -0500 |
| commit | 108145a60675ebc0e42e7964ee6666096bbf86ce (patch) | |
| tree | 19266ab0500d7bb188eb53634d484054d59473d2 /sound/soc/codecs/wm0010.c | |
| parent | 022aa51e3fda0b3c6688defaa859961c11c36ec8 (diff) | |
| parent | bf4edea863c435c302041cf8bb01c8b3ca729449 (diff) | |
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) | |||
| 372 | offset = 0; | 372 | offset = 0; |
| 373 | dsp = inforec->dsp_target; | 373 | dsp = inforec->dsp_target; |
| 374 | wm0010->boot_failed = false; | 374 | wm0010->boot_failed = false; |
| 375 | BUG_ON(!list_empty(&xfer_list)); | 375 | if (WARN_ON(!list_empty(&xfer_list))) |
| 376 | return -EINVAL; | ||
| 376 | init_completion(&done); | 377 | init_completion(&done); |
| 377 | 378 | ||
| 378 | /* First record should be INFO */ | 379 | /* First record should be INFO */ |