On Friday, September 09, 2011 11:38:44 AM Girdwood, Liam wrote:

On 9 September 2011 03:15, Axel Lin <axel.lin@gmail.commailto:axel.lin@gmail.com> wrote: Return proper error instead of 0 if clk_get fails.

Signed-off-by: Axel Lin <axel.lin@gmail.commailto:axel.lin@gmail.com> --- 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 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; -- 1.7.4.1

Acked-by: Liam Girdwood <lrg@ti.commailto:lrg@ti.com> Acked-by: Geoffrey Wossum gwossum@acm.org