iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Input: pxa27x_keypad - handle return value of clk_prepare_enable

Browse Source 
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>
This commit is contained in:
Arvind Yadav 2017-08-31 11:39:13 -07:00 committed by Dmitry Torokhov
parent 8a7f102c4b
commit 117b2dc58c
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/input/keyboard/pxa27x_keypad.c
View File

@ -644,9 +644,12 @@ static void pxa27x_keypad_config(struct pxa27x_keypad *keypad)
static int pxa27x_keypad_open(struct input_dev *dev) static int pxa27x_keypad_open(struct input_dev *dev)
{ {
struct pxa27x_keypad *keypad = input_get_drvdata(dev); struct pxa27x_keypad *keypad = input_get_drvdata(dev);
int ret;
/* Enable unit clock */ /* Enable unit clock */
clk_prepare_enable(keypad->clk); ret = clk_prepare_enable(keypad->clk);
if (ret)
return ret;
pxa27x_keypad_config(keypad); pxa27x_keypad_config(keypad);
return 0; return 0;
@ -683,6 +686,7 @@ static int pxa27x_keypad_resume(struct device *dev)
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
struct pxa27x_keypad *keypad = platform_get_drvdata(pdev); struct pxa27x_keypad *keypad = platform_get_drvdata(pdev);
struct input_dev *input_dev = keypad->input_dev; 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 * 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) { if (input_dev->users) {
/* Enable unit clock */ /* Enable unit clock */
clk_prepare_enable(keypad->clk); ret = clk_prepare_enable(keypad->clk);
pxa27x_keypad_config(keypad); if (!ret)
pxa27x_keypad_config(keypad);
} }
mutex_unlock(&input_dev->mutex); mutex_unlock(&input_dev->mutex);
} }
return 0; return ret;
} }
#endif #endif