Commit 39243ee7 authored Jun 15, 2016 by Linus Walleij Committed by Richard Weinberger Jun 23, 2016

gpio: make sure gpiod_to_irq() returns negative on NULL desc



commit 54d77198
("gpio: bail out silently on NULL descriptors")
doesn't work for gpiod_to_irq(): drivers assume that NULL
descriptors will give negative IRQ numbers in return.

It has been pointed out that returning 0 is NO_IRQ and that
drivers should be amended to treat this as an error, but that
is for the longer term: now let us repair the semantics.

Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Reported-by: Hans de Goede <hdegoede@redhat.com>
Tested-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

parent 0b305ccc

drivers/gpio/gpiolib.c

+8 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2056,7 +2056,14 @@ int gpiod_to_irq(const struct gpio_desc *desc)
	struct gpio_chip *chip;		struct gpio_chip *chip;
	int offset;		int offset;

	VALIDATE_DESC(desc);		/*
			* Cannot VALIDATE_DESC() here as gpiod_to_irq() consumer semantics
			* requires this function to not return zero on an invalid descriptor
			* but rather a negative error number.
			*/
			if (!desc \|\| !desc->gdev \|\| !desc->gdev->chip)
			return -EINVAL;

	chip = desc->gdev->chip;		chip = desc->gdev->chip;
	offset = gpio_chip_hwgpio(desc);		offset = gpio_chip_hwgpio(desc);
	if (chip->to_irq) {		if (chip->to_irq) {

Admin message