diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-10 00:18:10 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-10 00:18:10 +0900 |
| commit | 68817ee48a1aab274846e3abb9d4475c80276b54 (patch) | |
| tree | e66c244c9d87b2df5428cbe4f48b4aa57ba42239 /sound/soc/samsung | |
| parent | 0473e61b9aeb92e167516a90bf045aa925aa3782 (diff) | |
| parent | 371e7305c6c348d9e14a98fe337fadbd4106cfef (diff) | |
| download | linux-3.10-68817ee48a1aab274846e3abb9d4475c80276b54.tar.gz linux-3.10-68817ee48a1aab274846e3abb9d4475c80276b54.tar.bz2 linux-3.10-68817ee48a1aab274846e3abb9d4475c80276b54.zip | |
Merge branch 'for-3.1' into for-3.2
Diffstat (limited to 'sound/soc/samsung')
| -rw-r--r-- | sound/soc/samsung/jive_wm8750.c | 2 | ||||
| -rw-r--r-- | sound/soc/samsung/speyside_wm8962.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/samsung/jive_wm8750.c b/sound/soc/samsung/jive_wm8750.c index 3b53ad54bc3..14eb6ea69e7 100644 --- a/sound/soc/samsung/jive_wm8750.c +++ b/sound/soc/samsung/jive_wm8750.c @@ -131,7 +131,7 @@ static struct snd_soc_dai_link jive_dai = { .cpu_dai_name = "s3c2412-i2s", .codec_dai_name = "wm8750-hifi", .platform_name = "samsung-audio", - .codec_name = "wm8750-codec.0-0x1a", + .codec_name = "wm8750-codec.0-001a", .init = jive_wm8750_init, .ops = &jive_ops, }; diff --git a/sound/soc/samsung/speyside_wm8962.c b/sound/soc/samsung/speyside_wm8962.c index 8ac42bf8209..0b9eb5f7ec4 100644 --- a/sound/soc/samsung/speyside_wm8962.c +++ b/sound/soc/samsung/speyside_wm8962.c @@ -37,7 +37,7 @@ static int speyside_wm8962_set_bias_level(struct snd_soc_card *card, 44100 * 256, SND_SOC_CLOCK_IN); if (ret < 0) { - pr_err("Failed to set SYSCLK: %d\n"); + pr_err("Failed to set SYSCLK: %d\n", ret); return ret; } } |