Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney...

[deliverable/linux.git] / sound / soc / codecs / wm0010.c

diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c
index bf7804a12863924af7d3c4d3cbb2dd467a542dd8..71ce3159a62e73da7fb6c97f5ba7baed06db44c9 100644 (file)
--- 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 */