From d4561a8359e0a2baf5e277c2e8496637e75f60f3 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 29 Jun 2011 14:07:24 -0700
Subject: [PATCH] --- yaml --- r: 257564 b: refs/heads/master c:
 67d0c479d9392a89dd9ecf9d7b92148cc2251b00 h: refs/heads/master v: v3

---
 [refs]                                    |  2 +-
 trunk/sound/soc/samsung/speyside_wm8962.c | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 71cebb53b9bd..4cf5435680d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 57cc2432e172b191db488ec8ad430b283807af0a
+refs/heads/master: 67d0c479d9392a89dd9ecf9d7b92148cc2251b00
diff --git a/trunk/sound/soc/samsung/speyside_wm8962.c b/trunk/sound/soc/samsung/speyside_wm8962.c
index c0ba0bfd7f57..8ac42bf82090 100644
--- a/trunk/sound/soc/samsung/speyside_wm8962.c
+++ b/trunk/sound/soc/samsung/speyside_wm8962.c
@@ -30,14 +30,16 @@ static int speyside_wm8962_set_bias_level(struct snd_soc_card *card,
 						  WM8962_FLL_MCLK, 32768,
 						  44100 * 256);
 			if (ret < 0)
-				pr_err("Failed to start FLL\n");
+				pr_err("Failed to start FLL: %d\n", ret);
 
 			ret = snd_soc_dai_set_sysclk(codec_dai,
 						     WM8962_SYSCLK_FLL,
 						     44100 * 256,
 						     SND_SOC_CLOCK_IN);
-			if (ret < 0)
+			if (ret < 0) {
+				pr_err("Failed to set SYSCLK: %d\n");
 				return ret;
+			}
 		}
 		break;
 
@@ -59,13 +61,15 @@ static int speyside_wm8962_set_bias_level_post(struct snd_soc_card *card,
 	case SND_SOC_BIAS_STANDBY:
 		ret = snd_soc_dai_set_sysclk(codec_dai, WM8962_SYSCLK_MCLK,
 					     32768, SND_SOC_CLOCK_IN);
-		if (ret < 0)
+		if (ret < 0) {
+			pr_err("Failed to switch away from FLL: %d\n", ret);
 			return ret;
+		}
 
 		ret = snd_soc_dai_set_pll(codec_dai, WM8962_FLL,
 					  0, 0, 0);
 		if (ret < 0) {
-			pr_err("Failed to stop FLL\n");
+			pr_err("Failed to stop FLL: %d\n", ret);
 			return ret;
 		}
 		break;