Skip to content

Commit

Permalink
Input: pxa27x_keypad - handle return value of clk_prepare_enable
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Arvind Yadav authored and Dmitry Torokhov committed Aug 31, 2017
1 parent 8a7f102 commit 117b2dc
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions drivers/input/keyboard/pxa27x_keypad.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand All @@ -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

Expand Down

0 comments on commit 117b2dc

Please sign in to comment.