From 03eeea70bc54c0cfb9ed8d92daf06f376d285b99 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Fri, 9 Sep 2011 10:15:37 +0800
Subject: [PATCH] --- yaml --- r: 270570 b: refs/heads/master c:
 694741471b8df3734e01ecae7650be60ec111c2c h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/sound/soc/atmel/playpaq_wm8510.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f6dc9fc2942a..801aad715e55 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 283e42e0114aba331b0055839f6277a4a7cfbc64
+refs/heads/master: 694741471b8df3734e01ecae7650be60ec111c2c
diff --git a/trunk/sound/soc/atmel/playpaq_wm8510.c b/trunk/sound/soc/atmel/playpaq_wm8510.c
index 1aac2f4dbcf6..2909bfaed265 100644
--- a/trunk/sound/soc/atmel/playpaq_wm8510.c
+++ b/trunk/sound/soc/atmel/playpaq_wm8510.c
@@ -383,14 +383,17 @@ static int __init playpaq_asoc_init(void)
 	_gclk0 = clk_get(NULL, "gclk0");
 	if (IS_ERR(_gclk0)) {
 		_gclk0 = NULL;
+		ret = PTR_ERR(_gclk0);
 		goto err_gclk0;
 	}
 	_pll0 = clk_get(NULL, "pll0");
 	if (IS_ERR(_pll0)) {
 		_pll0 = NULL;
+		ret = PTR_ERR(_pll0);
 		goto err_pll0;
 	}
-	if (clk_set_parent(_gclk0, _pll0)) {
+	ret = clk_set_parent(_gclk0, _pll0);
+	if (ret) {
 		pr_warning("snd-soc-playpaq: "
 			   "Failed to set PLL0 as parent for DAC clock\n");
 		goto err_set_clk;