diff options
| author |   Fabio Estevam <fabio.estevam@freescale.com> | 2012-09-04 20:27:38 -0700 |
|---|---|---|
| committer |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-09-04 22:18:03 -0700 |
| commit | 609455f481772c5a875b88e860a2ee0e2f25ebf0 (patch) | |
| tree | 0207e1f6a5ad10f810e8a104b3f957a32806385a /drivers/input/keyboard | |
| parent | Input: usbtouchscreen - initialize eGalax devices (diff) | |
| download | linux-dev-609455f481772c5a875b88e860a2ee0e2f25ebf0.tar.xz linux-dev-609455f481772c5a875b88e860a2ee0e2f25ebf0.zip | |
Input: imx_keypad - fix missing clk conversions
commit a1e636e6d3 (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>
Diffstat (limited to 'drivers/input/keyboard')
| -rw-r--r-- | drivers/input/keyboard/imx_keypad.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/keyboard/imx_keypad.c b/drivers/input/keyboard/imx_keypad.c index ce68e361558c..cdc252612c0b 100644 --- a/drivers/input/keyboard/imx_keypad.c +++ b/drivers/input/keyboard/imx_keypad.c @@ -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); |