Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / gpio / gpio-mb86s7x.c

diff --git a/drivers/gpio/gpio-mb86s7x.c b/drivers/gpio/gpio-mb86s7x.c
index 21b1ce5abdfe1306c4b0a71e07a07ccca7faee51..ee93c0ab0a597d8d41a0d86c26d2b1ac34ac0e6b 100644 (file)
--- a/drivers/gpio/gpio-mb86s7x.c
+++ b/drivers/gpio/gpio-mb86s7x.c
@@ -58,6 +58,11 @@ static int mb86s70_gpio_request(struct gpio_chip *gc, unsigned gpio)
        spin_lock_irqsave(&gchip->lock, flags);
 
        val = readl(gchip->base + PFR(gpio));
+       if (!(val & OFFSET(gpio))) {
+               spin_unlock_irqrestore(&gchip->lock, flags);
+               return -EINVAL;
+       }
+
        val &= ~OFFSET(gpio);
        writel(val, gchip->base + PFR(gpio));