diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-09-05 01:57:19 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-09-05 01:57:19 -0400 |
| commit | e6c340171f0daaccc95b90abbeed2b837157ee11 (patch) | |
| tree | 843d4035be59bd791321910e52157ce527b3b4b3 /drivers/input/keyboard/tegra-kbc.c | |
| parent | a85442ade272121927a56e02f7dfde1127482df2 (diff) | |
| parent | 4cbe5a555fa58a79b6ecbb6c531b8bab0650778d (diff) | |
Merge tag 'v3.6-rc4' into next
Linux 3.6-rc4
# gpg: Signature made Sat 01 Sep 2012 10:40:33 AM PDT using RSA key ID 00411886
# gpg: Good signature from "Linus Torvalds <torvalds@linux-foundation.org>"
Diffstat (limited to 'drivers/input/keyboard/tegra-kbc.c')
| -rw-r--r-- | drivers/input/keyboard/tegra-kbc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/keyboard/tegra-kbc.c b/drivers/input/keyboard/tegra-kbc.c index c7ae23ead575..5faaf2553e33 100644 --- a/drivers/input/keyboard/tegra-kbc.c +++ b/drivers/input/keyboard/tegra-kbc.c | |||
| @@ -492,7 +492,7 @@ static int tegra_kbc_start(struct tegra_kbc *kbc) | |||
| 492 | unsigned int debounce_cnt; | 492 | unsigned int debounce_cnt; |
| 493 | u32 val = 0; | 493 | u32 val = 0; |
| 494 | 494 | ||
| 495 | clk_enable(kbc->clk); | 495 | clk_prepare_enable(kbc->clk); |
| 496 | 496 | ||
| 497 | /* Reset the KBC controller to clear all previous status.*/ | 497 | /* Reset the KBC controller to clear all previous status.*/ |
| 498 | tegra_periph_reset_assert(kbc->clk); | 498 | tegra_periph_reset_assert(kbc->clk); |
| @@ -556,7 +556,7 @@ static void tegra_kbc_stop(struct tegra_kbc *kbc) | |||
| 556 | disable_irq(kbc->irq); | 556 | disable_irq(kbc->irq); |
| 557 | del_timer_sync(&kbc->timer); | 557 | del_timer_sync(&kbc->timer); |
| 558 | 558 | ||
| 559 | clk_disable(kbc->clk); | 559 | clk_disable_unprepare(kbc->clk); |
| 560 | } | 560 | } |
| 561 | 561 | ||
| 562 | static int tegra_kbc_open(struct input_dev *dev) | 562 | static int tegra_kbc_open(struct input_dev *dev) |