[PATCH 1/2] gpio: Fix crash in gpiod_set_debounce()

[Thierry Reding]

Return an error if neither the ->set() nor the ->set_debounce() function
is implemented by the chip. Furthermore move locking further down so the
lock doesn't have to be unlocked on error. This is safe to do because at
this point the lock doesn't protect anything.

Signed-off-by: Thierry Reding <treding@xxxxxxxxxx>
---
Linus,

Feel free to squash this into the commit that introduced these:

	fc9bbfb: gpio: improve error path in gpiolib

Thierry

 drivers/gpio/gpiolib.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index acd19c9..9f8a134 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -1777,14 +1777,15 @@ static int gpiod_set_debounce(struct gpio_desc *desc, unsigned debounce)
 		return -EINVAL;
 	}
 
-	spin_lock_irqsave(&gpio_lock, flags);
-
 	chip = desc->chip;
 	if (!chip->set || !chip->set_debounce) {
 	  pr_warn("%s: missing set() or set_debounce() operations\n",
 		  __func__);
+		return -EIO;
 	}
 
+	spin_lock_irqsave(&gpio_lock, flags);
+
 	status = gpio_ensure_requested(desc);
 	if (status < 0)
 		goto fail;
-- 
1.8.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/