summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2023-01-24 18:20:26 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-02-01 08:27:28 +0100
commit621f296f11cff62244aa0d6758290894d31c9fce (patch)
tree0635af42fc07a9a700137b7bda1f54ed8b7e063c
parent071a8392869fb5a30bbfaf0096d0b4388781a385 (diff)
downloadlinux-621f296f11cff62244aa0d6758290894d31c9fce.tar.gz
linux-621f296f11cff62244aa0d6758290894d31c9fce.tar.bz2
linux-621f296f11cff62244aa0d6758290894d31c9fce.zip
gpio: mxc: Unlock on error path in mxc_flip_edge()
[ Upstream commit 37870358616ca7fdb1e90ad1cdd791655ec54414 ] We recently added locking to this function but one error path was over looked. Drop the lock before returning. Fixes: e5464277625c ("gpio: mxc: Protect GPIO irqchip RMW with bgpio spinlock") Signed-off-by: Dan Carpenter <error27@gmail.com> Acked-by: Marek Vasut <marex@denx.de> Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/gpio/gpio-mxc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-mxc.c b/drivers/gpio/gpio-mxc.c
index dd91908c72f1..853d9aa6b3b1 100644
--- a/drivers/gpio/gpio-mxc.c
+++ b/drivers/gpio/gpio-mxc.c
@@ -236,10 +236,11 @@ static void mxc_flip_edge(struct mxc_gpio_port *port, u32 gpio)
} else {
pr_err("mxc: invalid configuration for GPIO %d: %x\n",
gpio, edge);
- return;
+ goto unlock;
}
writel(val | (edge << (bit << 1)), reg);
+unlock:
raw_spin_unlock_irqrestore(&port->gc.bgpio_lock, flags);
}