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

[~andy/linux] / sound / soc / codecs / wm0010.c

diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c
index fe5e10fd51dfd8f9fa39fcdf8164a89aa9216f65..370af0cbcc9a97393c695a55936fb22b6ec6e103 100644 (file)
--- a/sound/soc/codecs/wm0010.c
+++ b/sound/soc/codecs/wm0010.c
@@ -342,7 +342,7 @@ static void byte_swap_64(u64 *data_in, u64 *data_out, u32 len)
                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 @@ static int wm0010_firmware_load(char *name, struct snd_soc_codec *codec)
 
        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;
        }