Browse Source

Input: imx_keypad - Propagate the real error code on platform_get_irq() failure

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>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Fabio Estevam 11 years ago
parent
commit
7fb45edba8
1 changed files with 2 additions and 2 deletions
  1. 2 2
      drivers/input/keyboard/imx_keypad.c

+ 2 - 2
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);
 	irq = platform_get_irq(pdev, 0);
 	if (irq < 0) {
 	if (irq < 0) {
 		dev_err(&pdev->dev, "no irq defined in platform data\n");
 		dev_err(&pdev->dev, "no irq defined in platform data\n");
-		return -EINVAL;
+		return irq;
 	}
 	}
 
 
 	input_dev = devm_input_allocate_device(&pdev->dev);
 	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),
 	keypad = devm_kzalloc(&pdev->dev, sizeof(struct imx_keypad),
-			     GFP_KERNEL);
+			      GFP_KERNEL);
 	if (!keypad) {
 	if (!keypad) {
 		dev_err(&pdev->dev, "not enough memory for driver data\n");
 		dev_err(&pdev->dev, "not enough memory for driver data\n");
 		return -ENOMEM;
 		return -ENOMEM;