From d02fb80ebcb6e6f7e3bea72bc4a1fc9b69f1f615 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Mon, 22 Oct 2012 10:18:06 +0100 Subject: [PATCH] --- yaml --- r: 339507 b: refs/heads/master c: 2577cf246233b1e4e38576f28a5ec05c9c6a6c2a h: refs/heads/master i: 339505: 8e90400204fbfa4a7fe9688bc7716a0a4a0912f8 339503: 583416aa03ef5b5ffa8916d0e277fef875243fe7 v: v3 --- [refs] | 2 +- trunk/arch/arm/kernel/smp_twd.c | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index b49bf74b4471..f3b50ed096f5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 871df85a592396b36d4c40b3860e8d7373626552 +refs/heads/master: 2577cf246233b1e4e38576f28a5ec05c9c6a6c2a diff --git a/trunk/arch/arm/kernel/smp_twd.c b/trunk/arch/arm/kernel/smp_twd.c index e1f906989bb8..780b05706364 100644 --- a/trunk/arch/arm/kernel/smp_twd.c +++ b/trunk/arch/arm/kernel/smp_twd.c @@ -248,17 +248,9 @@ static struct clk *twd_get_clock(void) return clk; } - err = clk_prepare(clk); + err = clk_prepare_enable(clk); if (err) { - pr_err("smp_twd: clock failed to prepare: %d\n", err); - clk_put(clk); - return ERR_PTR(err); - } - - err = clk_enable(clk); - if (err) { - pr_err("smp_twd: clock failed to enable: %d\n", err); - clk_unprepare(clk); + pr_err("smp_twd: clock failed to prepare+enable: %d\n", err); clk_put(clk); return ERR_PTR(err); }