Skip to content

Commit

Permalink
gpio: mvebu: fix irq domain leak
Browse files Browse the repository at this point in the history
Uwe Kleine-König pointed out we still have one resource leak in the mvebu
driver triggered on driver detach. Let's address it with a custom devm
action.

Fixes: 812d478 ("gpio/mvebu: Use irq_domain_add_linear")
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
  • Loading branch information
Bartosz Golaszewski committed Jul 20, 2023
1 parent 1945063 commit 644ee70
Showing 1 changed file with 13 additions and 5 deletions.
18 changes: 13 additions & 5 deletions drivers/gpio/gpio-mvebu.c
Original file line number Diff line number Diff line change
Expand Up @@ -1112,6 +1112,13 @@ static int mvebu_gpio_probe_syscon(struct platform_device *pdev,
return 0;
}

static void mvebu_gpio_remove_irq_domain(void *data)
{
struct irq_domain *domain = data;

irq_domain_remove(domain);
}

static int mvebu_gpio_probe(struct platform_device *pdev)
{
struct mvebu_gpio_chip *mvchip;
Expand Down Expand Up @@ -1246,13 +1253,18 @@ static int mvebu_gpio_probe(struct platform_device *pdev)
return -ENODEV;
}

err = devm_add_action_or_reset(&pdev->dev, mvebu_gpio_remove_irq_domain,
mvchip->domain);
if (err)
return err;

err = irq_alloc_domain_generic_chips(
mvchip->domain, ngpios, 2, np->name, handle_level_irq,
IRQ_NOREQUEST | IRQ_NOPROBE | IRQ_LEVEL, 0, 0);
if (err) {
dev_err(&pdev->dev, "couldn't allocate irq chips %s (DT).\n",
mvchip->chip.label);
goto err_domain;
return err;
}

/*
Expand Down Expand Up @@ -1292,10 +1304,6 @@ static int mvebu_gpio_probe(struct platform_device *pdev)
}

return 0;

err_domain:
irq_domain_remove(mvchip->domain);
return err;
}

static struct platform_driver mvebu_gpio_driver = {
Expand Down

0 comments on commit 644ee70

Please sign in to comment.