On Fri, May 25, 2012 at 08:14:46PM -0300, Fabio Estevam wrote: > From: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx> > > Prepare the clock before enabling it. > > Cc: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx> > Cc: <linux-input@xxxxxxxxxxxxxxx> > Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx> Acked-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> > --- > drivers/input/keyboard/imx_keypad.c | 8 ++++---- > 1 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/input/keyboard/imx_keypad.c b/drivers/input/keyboard/imx_keypad.c > index 6ee7421..9d57945 100644 > --- a/drivers/input/keyboard/imx_keypad.c > +++ b/drivers/input/keyboard/imx_keypad.c > @@ -378,7 +378,7 @@ static void imx_keypad_close(struct input_dev *dev) > imx_keypad_inhibit(keypad); > > /* Disable clock unit */ > - clk_disable(keypad->clk); > + clk_disable_unprepare(keypad->clk); > } > > static int imx_keypad_open(struct input_dev *dev) > @@ -391,7 +391,7 @@ static int imx_keypad_open(struct input_dev *dev) > keypad->enabled = true; > > /* Enable the kpp clock */ > - clk_enable(keypad->clk); > + clk_prepare_enable(keypad->clk); > imx_keypad_config(keypad); > > /* Sanity control, not all the rows must be actived now. */ > @@ -581,7 +581,7 @@ static int imx_kbd_suspend(struct device *dev) > mutex_lock(&input_dev->mutex); > > if (input_dev->users) > - clk_disable(kbd->clk); > + clk_disable_unprepare(kbd->clk); > > mutex_unlock(&input_dev->mutex); > > @@ -603,7 +603,7 @@ static int imx_kbd_resume(struct device *dev) > mutex_lock(&input_dev->mutex); > > if (input_dev->users) > - clk_enable(kbd->clk); > + clk_prepare_enable(kbd->clk); > > mutex_unlock(&input_dev->mutex); > > -- > 1.7.1 > > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
