diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-04-03 20:26:49 +0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-04-03 20:26:49 +0400 |
| commit | 692d96552c9a86a919fe6b5b82288a6c77c015a5 (patch) | |
| tree | a9e49c040d361ea2293a8966832378def5a06714 /drivers/input/keyboard/imx_keypad.c | |
| parent | e4dbedc7eac7da9db363a36f2bd4366962eeefcc (diff) | |
| parent | e2c3ecf0ea8e87c5209371af7da107ebc47a5639 (diff) | |
| download | linux-692d96552c9a86a919fe6b5b82288a6c77c015a5.tar.xz | |
Merge branch 'next' into for-linus
First round of input updates for 3.15.
Diffstat (limited to 'drivers/input/keyboard/imx_keypad.c')
| -rw-r--r-- | drivers/input/keyboard/imx_keypad.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/keyboard/imx_keypad.c b/drivers/input/keyboard/imx_keypad.c index cbf4f8038cba..97ec33572e56 100644 --- a/drivers/input/keyboard/imx_keypad.c +++ b/drivers/input/keyboard/imx_keypad.c @@ -439,7 +439,7 @@ static int imx_keypad_probe(struct platform_device *pdev) irq = platform_get_irq(pdev, 0); if (irq < 0) { dev_err(&pdev->dev, "no irq defined in platform data\n"); - return -EINVAL; + return irq; } input_dev = devm_input_allocate_device(&pdev->dev); @@ -449,7 +449,7 @@ static int imx_keypad_probe(struct platform_device *pdev) } keypad = devm_kzalloc(&pdev->dev, sizeof(struct imx_keypad), - GFP_KERNEL); + GFP_KERNEL); if (!keypad) { dev_err(&pdev->dev, "not enough memory for driver data\n"); return -ENOMEM; |