From 694741471b8df3734e01ecae7650be60ec111c2c Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Fri, 9 Sep 2011 10:15:37 +0800 Subject: [PATCH] ASoC: playpaq_wm8510: Return proper error if clk_get fails Return proper error instead of 0 if clk_get fails. Signed-off-by: Axel Lin Signed-off-by: Mark Brown --- sound/soc/atmel/playpaq_wm8510.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sound/soc/atmel/playpaq_wm8510.c b/sound/soc/atmel/playpaq_wm8510.c index 1aac2f4..2909bfa 100644 --- a/sound/soc/atmel/playpaq_wm8510.c +++ b/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; -- 2.7.4