aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBiju Das <biju.das@bp.renesas.com>2018-08-07 03:15:18 -0400
committerLinus Walleij <linus.walleij@linaro.org>2018-08-10 17:19:17 -0400
commit3789f5acb9bbe088f70779002f32e7c6a64000bc (patch)
treec8c19574ef7c1c3ba61666d54d1ba4213a27203e
parent21041daba2300c88f0da538b3480a9fae37430ea (diff)
gpiolib: Avoid calling chip->request() for unused gpios
Add a check for unused gpios to avoid chip->request() call to client driver for unused gpios. Signed-off-by: Biju Das <biju.das@bp.renesas.com> Reviewed-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--drivers/gpio/gpiolib.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 2c457e604403..e8f8a1999393 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -2267,6 +2267,7 @@ static int gpiod_request_commit(struct gpio_desc *desc, const char *label)
2267 struct gpio_chip *chip = desc->gdev->chip; 2267 struct gpio_chip *chip = desc->gdev->chip;
2268 int status; 2268 int status;
2269 unsigned long flags; 2269 unsigned long flags;
2270 unsigned offset;
2270 2271
2271 spin_lock_irqsave(&gpio_lock, flags); 2272 spin_lock_irqsave(&gpio_lock, flags);
2272 2273
@@ -2285,7 +2286,11 @@ static int gpiod_request_commit(struct gpio_desc *desc, const char *label)
2285 if (chip->request) { 2286 if (chip->request) {
2286 /* chip->request may sleep */ 2287 /* chip->request may sleep */
2287 spin_unlock_irqrestore(&gpio_lock, flags); 2288 spin_unlock_irqrestore(&gpio_lock, flags);
2288 status = chip->request(chip, gpio_chip_hwgpio(desc)); 2289 offset = gpio_chip_hwgpio(desc);
2290 if (gpiochip_line_is_valid(chip, offset))
2291 status = chip->request(chip, offset);
2292 else
2293 status = -EINVAL;
2289 spin_lock_irqsave(&gpio_lock, flags); 2294 spin_lock_irqsave(&gpio_lock, flags);
2290 2295
2291 if (status < 0) { 2296 if (status < 0) {