These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / input / keyboard / imx_keypad.c

diff --git a/kernel/drivers/input/keyboard/imx_keypad.c b/kernel/drivers/input/keyboard/imx_keypad.c
index 2e855e6..2165f3d 100644 (file)
--- a/kernel/drivers/input/keyboard/imx_keypad.c
+++ b/kernel/drivers/input/keyboard/imx_keypad.c
@@ -5,8 +5,6 @@
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
- *
- * <<Power management needs to be implemented>>.
  */
 
 #include <linux/clk.h>
@@ -506,7 +504,9 @@ static int imx_keypad_probe(struct platform_device *pdev)
        input_set_drvdata(input_dev, keypad);
 
        /* Ensure that the keypad will stay dormant until opened */
-       clk_prepare_enable(keypad->clk);
+       error = clk_prepare_enable(keypad->clk);
+       if (error)
+               return error;
        imx_keypad_inhibit(keypad);
        clk_disable_unprepare(keypad->clk);