diff options
author | Axel Lin <axel.lin@gmail.com> | 2011-09-08 22:15:37 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-09-09 12:42:00 -0400 |
commit | 694741471b8df3734e01ecae7650be60ec111c2c (patch) | |
tree | 53c3a7e5d87d1e79740626ea551567421d8a4fbc /sound/soc | |
parent | 283e42e0114aba331b0055839f6277a4a7cfbc64 (diff) |
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 <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/atmel/playpaq_wm8510.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/atmel/playpaq_wm8510.c b/sound/soc/atmel/playpaq_wm8510.c index 1aac2f4dbcf6..2909bfaed265 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) | |||
383 | _gclk0 = clk_get(NULL, "gclk0"); | 383 | _gclk0 = clk_get(NULL, "gclk0"); |
384 | if (IS_ERR(_gclk0)) { | 384 | if (IS_ERR(_gclk0)) { |
385 | _gclk0 = NULL; | 385 | _gclk0 = NULL; |
386 | ret = PTR_ERR(_gclk0); | ||
386 | goto err_gclk0; | 387 | goto err_gclk0; |
387 | } | 388 | } |
388 | _pll0 = clk_get(NULL, "pll0"); | 389 | _pll0 = clk_get(NULL, "pll0"); |
389 | if (IS_ERR(_pll0)) { | 390 | if (IS_ERR(_pll0)) { |
390 | _pll0 = NULL; | 391 | _pll0 = NULL; |
392 | ret = PTR_ERR(_pll0); | ||
391 | goto err_pll0; | 393 | goto err_pll0; |
392 | } | 394 | } |
393 | if (clk_set_parent(_gclk0, _pll0)) { | 395 | ret = clk_set_parent(_gclk0, _pll0); |
396 | if (ret) { | ||
394 | pr_warning("snd-soc-playpaq: " | 397 | pr_warning("snd-soc-playpaq: " |
395 | "Failed to set PLL0 as parent for DAC clock\n"); | 398 | "Failed to set PLL0 as parent for DAC clock\n"); |
396 | goto err_set_clk; | 399 | goto err_set_clk; |