aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/samsung
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-06-29 17:07:24 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-06-30 16:17:49 -0400
commit67d0c479d9392a89dd9ecf9d7b92148cc2251b00 (patch)
treeea3ea099153ad75645acd865b6b6956642027064 /sound/soc/samsung
parent57cc2432e172b191db488ec8ad430b283807af0a (diff)
ASoC: Improve error reporting in Speyside WM8962 driver
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'sound/soc/samsung')
-rw-r--r--sound/soc/samsung/speyside_wm8962.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/sound/soc/samsung/speyside_wm8962.c b/sound/soc/samsung/speyside_wm8962.c
index c0ba0bfd7f5..8ac42bf8209 100644
--- a/sound/soc/samsung/speyside_wm8962.c
+++ b/sound/soc/samsung/speyside_wm8962.c
@@ -30,14 +30,16 @@ static int speyside_wm8962_set_bias_level(struct snd_soc_card *card,
30 WM8962_FLL_MCLK, 32768, 30 WM8962_FLL_MCLK, 32768,
31 44100 * 256); 31 44100 * 256);
32 if (ret < 0) 32 if (ret < 0)
33 pr_err("Failed to start FLL\n"); 33 pr_err("Failed to start FLL: %d\n", ret);
34 34
35 ret = snd_soc_dai_set_sysclk(codec_dai, 35 ret = snd_soc_dai_set_sysclk(codec_dai,
36 WM8962_SYSCLK_FLL, 36 WM8962_SYSCLK_FLL,
37 44100 * 256, 37 44100 * 256,
38 SND_SOC_CLOCK_IN); 38 SND_SOC_CLOCK_IN);
39 if (ret < 0) 39 if (ret < 0) {
40 pr_err("Failed to set SYSCLK: %d\n");
40 return ret; 41 return ret;
42 }
41 } 43 }
42 break; 44 break;
43 45
@@ -59,13 +61,15 @@ static int speyside_wm8962_set_bias_level_post(struct snd_soc_card *card,
59 case SND_SOC_BIAS_STANDBY: 61 case SND_SOC_BIAS_STANDBY:
60 ret = snd_soc_dai_set_sysclk(codec_dai, WM8962_SYSCLK_MCLK, 62 ret = snd_soc_dai_set_sysclk(codec_dai, WM8962_SYSCLK_MCLK,
61 32768, SND_SOC_CLOCK_IN); 63 32768, SND_SOC_CLOCK_IN);
62 if (ret < 0) 64 if (ret < 0) {
65 pr_err("Failed to switch away from FLL: %d\n", ret);
63 return ret; 66 return ret;
67 }
64 68
65 ret = snd_soc_dai_set_pll(codec_dai, WM8962_FLL, 69 ret = snd_soc_dai_set_pll(codec_dai, WM8962_FLL,
66 0, 0, 0); 70 0, 0, 0);
67 if (ret < 0) { 71 if (ret < 0) {
68 pr_err("Failed to stop FLL\n"); 72 pr_err("Failed to stop FLL: %d\n", ret);
69 return ret; 73 return ret;
70 } 74 }
71 break; 75 break;