mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
26 lines
920 B
Diff
26 lines
920 B
Diff
|
From 0cddfafa817a776063ba6f00fb439d9a415235f9 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
|
||
|
|
@@ -1135,7 +1135,7 @@ static int bcm2835_pinctrl_probe(struct
|
||
|
|
raw_spin_lock_init(&pc->irq_lock[i]);
|
||
|
|
}
|
||
|
|
|
||
|
|
- 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");
|
||
|
|
return err;
|