From 376d3808c278f7b2d48e5f962a1bc5fadbaf0d11 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 15 Mar 2012 08:19:29 +0000 Subject: [PATCH] --- yaml --- r: 291559 b: refs/heads/master c: 4823cd388dd68015e254d1449bd63ffe47d83fa7 h: refs/heads/master i: 291557: 08a1878780b8a0c46d4048c502501600a98af188 291555: 0aa040f785f910a398b7dcf472f8edeea43d5195 291551: 729656d70e4c525b2d9b0ef47604e49d5aa5fad8 v: v3 --- [refs] | 2 +- trunk/drivers/net/irda/pxaficp_ir.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 11cde56aa8be..1069bd357a7f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 124d37e9f088a8f56494b0264d63d22555f53fef +refs/heads/master: 4823cd388dd68015e254d1449bd63ffe47d83fa7 diff --git a/trunk/drivers/net/irda/pxaficp_ir.c b/trunk/drivers/net/irda/pxaficp_ir.c index 81d5275a15e2..ff16daf33ae1 100644 --- a/trunk/drivers/net/irda/pxaficp_ir.c +++ b/trunk/drivers/net/irda/pxaficp_ir.c @@ -128,20 +128,20 @@ struct pxa_irda { static inline void pxa_irda_disable_clk(struct pxa_irda *si) { if (si->cur_clk) - clk_disable(si->cur_clk); + clk_disable_unprepare(si->cur_clk); si->cur_clk = NULL; } static inline void pxa_irda_enable_firclk(struct pxa_irda *si) { si->cur_clk = si->fir_clk; - clk_enable(si->fir_clk); + clk_prepare_enable(si->fir_clk); } static inline void pxa_irda_enable_sirclk(struct pxa_irda *si) { si->cur_clk = si->sir_clk; - clk_enable(si->sir_clk); + clk_prepare_enable(si->sir_clk); }