summaryrefslogtreecommitdiff
path: root/sound/soc/generic
diff options
context:
space:
mode:
authorXiubo Li <Li.Xiubo@freescale.com>2014-01-06 08:34:36 +0400
committerMark Brown <broonie@linaro.org>2014-01-06 19:28:50 +0400
commite2a19ac6c5b27ac93fe744c0ff0823cde52c9cbb (patch)
tree275b441f1177cdeebee73f4b03096ba2f47fa731 /sound/soc/generic
parent71467e46414d3bab220de77d3d085be0c0aa03e1 (diff)
downloadlinux-e2a19ac6c5b27ac93fe744c0ff0823cde52c9cbb.tar.xz
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>
Diffstat (limited to 'sound/soc/generic')
-rw-r--r--sound/soc/generic/simple-card.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 58c217e403ae..d4402fb57253 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;