summaryrefslogtreecommitdiffstats
path: root/drivers/input/keyboard
diff options
context:
space:
mode:
authorVladimir Zapolskiy <vz@mleia.com>2016-12-07 17:22:36 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2016-12-07 19:21:05 -0800
commit951a086437b7c29a9f352e0ee6272fa1d90d783e (patch)
tree58de469e97770f6b636a712ef4231733fbc1bf20 /drivers/input/keyboard
parentaccbcea3465b2038fa8aa66cfa8f40db7ab1c83c (diff)
downloadblackbird-op-linux-951a086437b7c29a9f352e0ee6272fa1d90d783e.tar.gz
blackbird-op-linux-951a086437b7c29a9f352e0ee6272fa1d90d783e.zip
Input: lpc32xx-keys - fix invalid error handling of a requested irq
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>
Diffstat (limited to 'drivers/input/keyboard')
-rw-r--r--drivers/input/keyboard/lpc32xx-keys.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/lpc32xx-keys.c b/drivers/input/keyboard/lpc32xx-keys.c
index 265d641c40e2..632523d4f5dc 100644
--- a/drivers/input/keyboard/lpc32xx-keys.c
+++ b/drivers/input/keyboard/lpc32xx-keys.c
@@ -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;
}
OpenPOWER on IntegriCloud