Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 951a0864 authored by Vladimir Zapolskiy's avatar Vladimir Zapolskiy Committed by Dmitry Torokhov
Browse files

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: default avatarVladimir Zapolskiy <vz@mleia.com>
Acked-by: default avatarSylvain Lemieux <slemieux.tyco@gmail.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent accbcea3

drivers/input/keyboard/lpc32xx-keys.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}