Merge remote-tracking branch 'asoc/fix/wm0010' into asoc-linus

diff --combined sound/soc/codecs/wm0010.c
index 8df2b6e1a1a6c7fa74cb6cb0b8f94afced8efc2e,fe5e10fd51dfd8f9fa39fcdf8164a89aa9216f65..370af0cbcc9a97393c695a55936fb22b6ec6e103
--- 1/sound/soc/codecs/wm0010.c
--- 2/sound/soc/codecs/wm0010.c
+++ b/sound/soc/codecs/wm0010.c
@@@ -342,7 -342,7 +342,7 @@@ static void byte_swap_64(u64 *data_in, 
                data_out[i] = cpu_to_be64(le64_to_cpu(data_in[i]));
  }
  
 -static int wm0010_firmware_load(char *name, struct snd_soc_codec *codec)
 +static int wm0010_firmware_load(const char *name, struct snd_soc_codec *codec)
  {
        struct spi_device *spi = to_spi_device(codec->dev);
        struct wm0010_priv *wm0010 = snd_soc_codec_get_drvdata(codec);
@@@ -361,8 -361,8 +361,8 @@@
  
        ret = request_firmware(&fw, name, codec->dev);
        if (ret != 0) {
 -              dev_err(codec->dev, "Failed to request application: %d\n",
 -                      ret);
 +              dev_err(codec->dev, "Failed to request application(%s): %d\n",
 +                      name, ret);
                return ret;
        }
  
@@@ -667,6 -667,7 +667,7 @@@ static int wm0010_boot(struct snd_soc_c
                /* On wm0010 only the CLKCTRL1 value is used */
                pll_rec.clkctrl1 = wm0010->pll_clkctrl1;
  
+               ret = -ENOMEM;
                len = pll_rec.length + 8;
                out = kzalloc(len, GFP_KERNEL);
                if (!out) {