mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 01:11:14 +00:00
2bb02ccae3
Deleted (upstreamed): bcm27xx/patches-5.10/950-0186-pinctrl-bcm2835-Change-init-order-for-gpio-hogs.patch [1] sunxi/patches-5.10/103-arm64-dts-allwinner-orangepi-zero-plus-fix-PHY-mo.patch [2] [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.89&id=ba696b470839d70c6b8290c1f798bac7fb2a584c [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.89&id=93a957bbf46ceb224b959de61fe85cfc6f71b6c7 Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
26 lines
995 B
Diff
26 lines
995 B
Diff
From 0da3ef334d4949431f34fea9f315d967e47a6a73 Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.org>
|
|
Date: Mon, 6 Jan 2020 16:04:30 +0000
|
|
Subject: [PATCH] pinctrl: bcm2835: Remove gpiochip on error
|
|
|
|
A failure in gpiochip_irqchip_add leads to a leak of a gpiochip. Fix
|
|
the leak with the use of devm_gpiochip_add_data.
|
|
|
|
Fixes: 85ae9e512f43 ("pinctrl: bcm2835: switch to GPIOLIB_IRQCHIP")
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|
---
|
|
drivers/pinctrl/bcm/pinctrl-bcm2835.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c
|
|
+++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
|
|
@@ -1314,7 +1314,7 @@ static int bcm2835_pinctrl_probe(struct
|
|
girq->default_type = IRQ_TYPE_NONE;
|
|
girq->handler = handle_level_irq;
|
|
|
|
- err = gpiochip_add_data(&pc->gpio_chip, pc);
|
|
+ err = devm_gpiochip_add_data(dev, &pc->gpio_chip, pc);
|
|
if (err) {
|
|
dev_err(dev, "could not add GPIO chip\n");
|
|
pinctrl_remove_gpio_range(pc->pctl_dev, &pc->gpio_range);
|