diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-12 08:57:26 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-12 08:57:26 -0400 |
| commit | 106c386ad550c849abc38cecd82d4d477912fb68 (patch) | |
| tree | f486f912cecf54e9b3d27660c8dfebf097247cb9 /sound | |
| parent | 6d21c5d64bc0a86affab5d6addbc01652e332b55 (diff) | |
| parent | 3e112af51eedda46fe87d2cba427d48c4b7695fd (diff) | |
Merge remote-tracking branch 'asoc/topic/wm0010' into asoc-next
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/wm0010.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c index ad2fee4bb4cd..8df2b6e1a1a6 100644 --- 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) | |||
| 342 | data_out[i] = cpu_to_be64(le64_to_cpu(data_in[i])); | 342 | data_out[i] = cpu_to_be64(le64_to_cpu(data_in[i])); |
| 343 | } | 343 | } |
| 344 | 344 | ||
| 345 | static int wm0010_firmware_load(char *name, struct snd_soc_codec *codec) | 345 | static int wm0010_firmware_load(const char *name, struct snd_soc_codec *codec) |
| 346 | { | 346 | { |
| 347 | struct spi_device *spi = to_spi_device(codec->dev); | 347 | struct spi_device *spi = to_spi_device(codec->dev); |
| 348 | struct wm0010_priv *wm0010 = snd_soc_codec_get_drvdata(codec); | 348 | 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 | 361 | ||
| 362 | ret = request_firmware(&fw, name, codec->dev); | 362 | ret = request_firmware(&fw, name, codec->dev); |
| 363 | if (ret != 0) { | 363 | if (ret != 0) { |
| 364 | dev_err(codec->dev, "Failed to request application: %d\n", | 364 | dev_err(codec->dev, "Failed to request application(%s): %d\n", |
| 365 | ret); | 365 | name, ret); |
| 366 | return ret; | 366 | return ret; |
| 367 | } | 367 | } |
| 368 | 368 | ||