From: Xiubo Li <Li.Xiubo@freescale.com>
Date: Mon, 6 Jan 2014 04:34:36 +0000 (+0800)
Subject: ASoC: simple-card: Fix the sysclk selection.
X-Git-Tag: v3.14-rc1~143^2~1^2^2^7~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e2a19ac6c5b27ac93fe744c0ff0823cde52c9cbb;p=thirdparty%2Flinux.git

ASoC: simple-card: Fix the sysclk selection.

For spdif there is no need to do the sysclk setting.

Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
---

diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 58c217e403ae3..d4402fb572536 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -106,12 +106,8 @@ asoc_simple_card_sub_parse_of(struct device_node *np,
 				     &dai->sysclk);
 	} else {
 		clk = of_clk_get(*node, 0);
-		if (IS_ERR(clk)) {
-			ret = PTR_ERR(clk);
-			goto parse_error;
-		}
-
-		dai->sysclk = clk_get_rate(clk);
+		if (!IS_ERR(clk))
+			dai->sysclk = clk_get_rate(clk);
 	}
 
 	ret = 0;