From 89aff9e732520802775a23c3e90cf7023d3c65e2 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 4 Sep 2012 20:27:38 -0700 Subject: [PATCH] --- yaml --- r: 323024 b: refs/heads/master c: 609455f481772c5a875b88e860a2ee0e2f25ebf0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/input/keyboard/imx_keypad.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7cbaa0ddb9c9..5dfd5afb933c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 037a833ed05a86d01ea27a2c32043b86c549be1b +refs/heads/master: 609455f481772c5a875b88e860a2ee0e2f25ebf0 diff --git a/trunk/drivers/input/keyboard/imx_keypad.c b/trunk/drivers/input/keyboard/imx_keypad.c index ce68e361558c..cdc252612c0b 100644 --- a/trunk/drivers/input/keyboard/imx_keypad.c +++ b/trunk/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);