Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6-microblaze.git] / drivers / input / keyboard / ep93xx_keypad.c

diff --git a/drivers/input/keyboard/ep93xx_keypad.c b/drivers/input/keyboard/ep93xx_keypad.c
index c819433..e0e931e 100644 (file)
--- a/drivers/input/keyboard/ep93xx_keypad.c
+++ b/drivers/input/keyboard/ep93xx_keypad.c
@@ -157,7 +157,7 @@ static int ep93xx_keypad_open(struct input_dev *pdev)
 
        if (!keypad->enabled) {
                ep93xx_keypad_config(keypad);
-               clk_enable(keypad->clk);
+               clk_prepare_enable(keypad->clk);
                keypad->enabled = true;
        }
 
@@ -169,7 +169,7 @@ static void ep93xx_keypad_close(struct input_dev *pdev)
        struct ep93xx_keypad *keypad = input_get_drvdata(pdev);
 
        if (keypad->enabled) {
-               clk_disable(keypad->clk);
+               clk_disable_unprepare(keypad->clk);
                keypad->enabled = false;
        }
 }