Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Sender: "willmcvicker via sendgmr" <willmcvicker@willmcvicker.c.googlers.com>
Date:   Mon, 30 Nov 2020 22:47:53 +0000
In-Reply-To: <20201130224753.1569357-1-willmcvicker@google.com>
Message-Id: <20201130224753.1569357-2-willmcvicker@google.com>
Mime-Version: 1.0
References: <20201130224753.1569357-1-willmcvicker@google.com>
Subject: [PATCH v1 1/1] gpiolib: Don't free if pin ranges are not defined
From:   Will McVicker <willmcvicker@google.com>
To:     Linus Walleij <linus.walleij@linaro.org>,
        Bartosz Golaszewski <bgolaszewski@baylibre.com>,
        Thierry Reding <treding@nvidia.com>
Cc:     Edmond Chung <edmondchung@google.com>,
        Andrew Chant <achant@google.com>, linux-gpio@vger.kernel.org,
        linux-kernel@vger.kernel.org, kernel-team@android.com,
        Will McVicker <willmcvicker@google.com>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

From: Edmond Chung <edmondchung@google.com>

A similar check was added in gpiochip_generic_request, but not in free.
This has caused an imbalance count of request vs. free calls to the
pinctrl driver. This patch is targeted to fix that issue.

Fixes: 2ab73c6d8323 ("gpio: Support GPIO controllers without pin-ranges")
Signed-off-by: Edmond Chung <edmondchung@google.com>
Signed-off-by: Andrew Chant <achant@google.com>
Signed-off-by: Will McVicker <willmcvicker@google.com>
---
 drivers/gpio/gpiolib.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 089ddcaa9bc6..6e3c4d7a7d14 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -1806,6 +1806,11 @@ EXPORT_SYMBOL_GPL(gpiochip_generic_request);
  */
 void gpiochip_generic_free(struct gpio_chip *gc, unsigned offset)
 {
+#ifdef CONFIG_PINCTRL
+	if (list_empty(&gc->gpiodev->pin_ranges))
+		return;
+#endif
+
 	pinctrl_gpio_free(gc->gpiodev->base + offset);
 }
 EXPORT_SYMBOL_GPL(gpiochip_generic_free);
-- 
2.29.2.454.gaff20da3a2-goog