Commit 24108993 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Sebastian Reichel
Browse files

power: supply: ab8500_fg: Do not free non-requested IRQs in probe's error path 



When requesting interrupt fails, free only interrupts already requested,
not all of them.

Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent ccc023a5

drivers/power/supply/ab8500_fg.c

+5 −3
Original line number Diff line number Diff line
@@ -3165,7 +3165,7 @@ static int ab8500_fg_probe(struct platform_device *pdev) 
		if (ret != 0) {

			dev_err(di->dev, "failed to request %s IRQ %d: %d\n",

				ab8500_fg_irq_th[i].name, irq, ret);

			goto free_irq;

			goto free_irq_th;

		}

		dev_dbg(di->dev, "Requested %s IRQ %d: %d\n",

			ab8500_fg_irq_th[i].name, irq, ret);
@@ -3180,7 +3180,7 @@ static int ab8500_fg_probe(struct platform_device *pdev) 
	if (ret != 0) {

		dev_err(di->dev, "failed to request %s IRQ %d: %d\n",

			ab8500_fg_irq_bh[0].name, irq, ret);

		goto free_irq;

		goto free_irq_th;

	}

	dev_dbg(di->dev, "Requested %s IRQ %d: %d\n",

		ab8500_fg_irq_bh[0].name, irq, ret);
@@ -3222,7 +3222,9 @@ free_irq: 
	/* We also have to free all registered irqs */

	irq = platform_get_irq_byname(pdev, ab8500_fg_irq_bh[0].name);

	free_irq(irq, di);

	for (i = 0; i < ARRAY_SIZE(ab8500_fg_irq_th); i++) {

free_irq_th:

	while (--i >= 0) {

		/* Last assignment of i from primary interrupt handlers */

		irq = platform_get_irq_byname(pdev, ab8500_fg_irq_th[i].name);

		free_irq(irq, di);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE