Skip to content

Commit

Permalink
Input: imx_keypad - fix missing clk conversions
Browse files Browse the repository at this point in the history
commit a1e636e (Input: imx_keypad - use clk_prepare_enable/
clk_disable_unprepare()) missed to update clk_enable/clk_disable
in imx_keypad_probe().

Fix it so that we do not get clk warnings at boot.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
  • Loading branch information
Fabio Estevam authored and Dmitry Torokhov committed Sep 5, 2012
1 parent 037a833 commit 609455f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/input/keyboard/imx_keypad.c
Original file line number Diff line number Diff line change
Expand Up @@ -516,9 +516,9 @@ static int __devinit imx_keypad_probe(struct platform_device *pdev)
input_set_drvdata(input_dev, keypad);

/* Ensure that the keypad will stay dormant until opened */
clk_enable(keypad->clk);
clk_prepare_enable(keypad->clk);
imx_keypad_inhibit(keypad);
clk_disable(keypad->clk);
clk_disable_unprepare(keypad->clk);

error = request_irq(irq, imx_keypad_irq_handler, 0,
pdev->name, keypad);
Expand Down

0 comments on commit 609455f

Please sign in to comment.