diff options
author | Mike Turquette <mturquette@linaro.org> | 2014-01-16 13:13:46 -0800 |
---|---|---|
committer | Mike Turquette <mturquette@linaro.org> | 2014-01-16 13:13:46 -0800 |
commit | 0099d8851681a550065e36fe89719616ab5f63d4 (patch) | |
tree | 8881a7064ff68cc97c71abd4b5bd1a67de314871 /drivers/clk/ux500/clk-prcmu.c | |
parent | d6e0a2dd12f4067a5bcefb8bbd8ddbeff800afbc (diff) | |
parent | 2e84d75116c17c2034e917b411250d2d11755435 (diff) | |
download | linux-0099d8851681a550065e36fe89719616ab5f63d4.tar.gz |
Merge remote-tracking branch 'linaro/clk-next' into clk-next
Diffstat (limited to 'drivers/clk/ux500/clk-prcmu.c')
-rw-r--r-- | drivers/clk/ux500/clk-prcmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/ux500/clk-prcmu.c b/drivers/clk/ux500/clk-prcmu.c index 293a28854417..e2d63bc47436 100644 --- a/drivers/clk/ux500/clk-prcmu.c +++ b/drivers/clk/ux500/clk-prcmu.c @@ -36,7 +36,7 @@ static int clk_prcmu_prepare(struct clk_hw *hw) if (!ret) clk->is_prepared = 1; - return ret;; + return ret; } static void clk_prcmu_unprepare(struct clk_hw *hw) |