Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

[~andy/linux] / drivers / net / irda / pxaficp_ir.c

diff --git a/drivers/net/irda/pxaficp_ir.c b/drivers/net/irda/pxaficp_ir.c
index 81d5275a15e298dc11a4208b00ffbbbf4cd1864b..ff16daf33ae130df9f3de215e790e1c997748870 100644 (file)
--- a/drivers/net/irda/pxaficp_ir.c
+++ b/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);
 }