Message ID | 1392433187-7756-1-git-send-email-festevam@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Sat, Feb 15, 2014 at 12:59:46AM -0200, Fabio Estevam wrote: > From: Fabio Estevam <fabio.estevam@freescale.com> > > No need to return a 'fake' return value on platform_get_irq() failure. > > Just return the error code itself instead. > > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Applied, thank you. > --- > drivers/input/keyboard/imx_keypad.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/input/keyboard/imx_keypad.c b/drivers/input/keyboard/imx_keypad.c > index cbf4f80..de07035 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); > -- > 1.8.1.2 >
diff --git a/drivers/input/keyboard/imx_keypad.c b/drivers/input/keyboard/imx_keypad.c index cbf4f80..de07035 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);