Commit 106c386a authored by Mark Brown's avatar Mark Brown

Merge remote-tracking branch 'asoc/topic/wm0010' into asoc-next

parents 6d21c5d6 3e112af5
...@@ -342,7 +342,7 @@ static void byte_swap_64(u64 *data_in, u64 *data_out, u32 len) ...@@ -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])); 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 spi_device *spi = to_spi_device(codec->dev);
struct wm0010_priv *wm0010 = snd_soc_codec_get_drvdata(codec); 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) ...@@ -361,8 +361,8 @@ static int wm0010_firmware_load(char *name, struct snd_soc_codec *codec)
ret = request_firmware(&fw, name, codec->dev); ret = request_firmware(&fw, name, codec->dev);
if (ret != 0) { if (ret != 0) {
dev_err(codec->dev, "Failed to request application: %d\n", dev_err(codec->dev, "Failed to request application(%s): %d\n",
ret); name, ret);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment