aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/input/keyboard/imx_keypad.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/keyboard/imx_keypad.c b/drivers/input/keyboard/imx_keypad.c
index 6ee7421e2321..9d57945db53d 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)
378 imx_keypad_inhibit(keypad); 378 imx_keypad_inhibit(keypad);
379 379
380 /* Disable clock unit */ 380 /* Disable clock unit */
381 clk_disable(keypad->clk); 381 clk_disable_unprepare(keypad->clk);
382} 382}
383 383
384static int imx_keypad_open(struct input_dev *dev) 384static int imx_keypad_open(struct input_dev *dev)
@@ -391,7 +391,7 @@ static int imx_keypad_open(struct input_dev *dev)
391 keypad->enabled = true; 391 keypad->enabled = true;
392 392
393 /* Enable the kpp clock */ 393 /* Enable the kpp clock */
394 clk_enable(keypad->clk); 394 clk_prepare_enable(keypad->clk);
395 imx_keypad_config(keypad); 395 imx_keypad_config(keypad);
396 396
397 /* Sanity control, not all the rows must be actived now. */ 397 /* Sanity control, not all the rows must be actived now. */
@@ -581,7 +581,7 @@ static int imx_kbd_suspend(struct device *dev)
581 mutex_lock(&input_dev->mutex); 581 mutex_lock(&input_dev->mutex);
582 582
583 if (input_dev->users) 583 if (input_dev->users)
584 clk_disable(kbd->clk); 584 clk_disable_unprepare(kbd->clk);
585 585
586 mutex_unlock(&input_dev->mutex); 586 mutex_unlock(&input_dev->mutex);
587 587
@@ -603,7 +603,7 @@ static int imx_kbd_resume(struct device *dev)
603 mutex_lock(&input_dev->mutex); 603 mutex_lock(&input_dev->mutex);
604 604
605 if (input_dev->users) 605 if (input_dev->users)
606 clk_enable(kbd->clk); 606 clk_prepare_enable(kbd->clk);
607 607
608 mutex_unlock(&input_dev->mutex); 608 mutex_unlock(&input_dev->mutex);
609 609