OSDN Git Service

Input: pxa27x_keypad - handle return value of clk_prepare_enable
authorArvind Yadav <arvind.yadav.cs@gmail.com>
Thu, 31 Aug 2017 18:39:13 +0000 (11:39 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 31 Aug 2017 18:57:35 +0000 (11:57 -0700)
clk_prepare_enable() can fail here and we must check its return value.

Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/keyboard/pxa27x_keypad.c

index 3841fa3..d0bdaea 100644 (file)
@@ -644,9 +644,12 @@ static void pxa27x_keypad_config(struct pxa27x_keypad *keypad)
 static int pxa27x_keypad_open(struct input_dev *dev)
 {
        struct pxa27x_keypad *keypad = input_get_drvdata(dev);
-
+       int ret;
        /* Enable unit clock */
-       clk_prepare_enable(keypad->clk);
+       ret = clk_prepare_enable(keypad->clk);
+       if (ret)
+               return ret;
+
        pxa27x_keypad_config(keypad);
 
        return 0;
@@ -683,6 +686,7 @@ static int pxa27x_keypad_resume(struct device *dev)
        struct platform_device *pdev = to_platform_device(dev);
        struct pxa27x_keypad *keypad = platform_get_drvdata(pdev);
        struct input_dev *input_dev = keypad->input_dev;
+       int ret = 0;
 
        /*
         * If the keypad is used as wake up source, the clock is not turned
@@ -695,14 +699,15 @@ static int pxa27x_keypad_resume(struct device *dev)
 
                if (input_dev->users) {
                        /* Enable unit clock */
-                       clk_prepare_enable(keypad->clk);
-                       pxa27x_keypad_config(keypad);
+                       ret = clk_prepare_enable(keypad->clk);
+                       if (!ret)
+                               pxa27x_keypad_config(keypad);
                }
 
                mutex_unlock(&input_dev->mutex);
        }
 
-       return 0;
+       return ret;
 }
 #endif