950-0192-pinctrl-bcm2835-Remove-gpiochip-on-error.patch 954 B

12345678910111213141516171819202122232425
  1. From ffec7861dda17a3da5f6337fbf89114f86437d7e Mon Sep 17 00:00:00 2001
  2. From: Phil Elwell <[email protected]>
  3. Date: Mon, 6 Jan 2020 16:04:30 +0000
  4. Subject: [PATCH] pinctrl: bcm2835: Remove gpiochip on error
  5. A failure in gpiochip_irqchip_add leads to a leak of a gpiochip. Fix
  6. the leak with the use of devm_gpiochip_add_data.
  7. Fixes: 85ae9e512f43 ("pinctrl: bcm2835: switch to GPIOLIB_IRQCHIP")
  8. Signed-off-by: Phil Elwell <[email protected]>
  9. ---
  10. drivers/pinctrl/bcm/pinctrl-bcm2835.c | 2 +-
  11. 1 file changed, 1 insertion(+), 1 deletion(-)
  12. --- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c
  13. +++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
  14. @@ -1337,7 +1337,7 @@ static int bcm2835_pinctrl_probe(struct
  15. girq->default_type = IRQ_TYPE_NONE;
  16. girq->handler = handle_level_irq;
  17. - err = gpiochip_add_data(&pc->gpio_chip, pc);
  18. + err = devm_gpiochip_add_data(dev, &pc->gpio_chip, pc);
  19. if (err) {
  20. dev_err(dev, "could not add GPIO chip\n");
  21. goto out_remove;