Skip to content

Commit

Permalink
Input: lpc32xx-keys - fix invalid error handling of a requested irq
Browse files Browse the repository at this point in the history
Semantics of NR_IRQS is different on machines with SPARSE_IRQ option
disabled or enabled, in the latter case IRQs are allocated starting
at least from the value specified by NR_IRQS and going upwards, so
the check of (irq >= NR_IRQ) to decide about an error code returned by
platform_get_irq() is completely invalid, don't attempt to overrule
irq subsystem in the driver.

The change fixes lpc32xx_keys driver initialization on boot:

  lpc32xx_keys 40050000.key: failed to get platform irq
  lpc32xx_keys: probe of 40050000.key failed with error -22

Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
Acked-by: Sylvain Lemieux <slemieux.tyco@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
  • Loading branch information
Vladimir Zapolskiy authored and Dmitry Torokhov committed Dec 8, 2016
1 parent accbcea commit 951a086
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/input/keyboard/lpc32xx-keys.c
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ static int lpc32xx_kscan_probe(struct platform_device *pdev)
}

irq = platform_get_irq(pdev, 0);
if (irq < 0 || irq >= NR_IRQS) {
if (irq < 0) {
dev_err(&pdev->dev, "failed to get platform irq\n");
return -EINVAL;
}
Expand Down

0 comments on commit 951a086

Please sign in to comment.