[PATCH] regulator: mt6363: Fix incorrect and redundant IRQ disposal in probe

[PATCH] regulator: mt6363: Fix incorrect and redundant IRQ disposal in probe

[Felix Gu]

In mt6363_regulator_probe(), devm_add_action_or_reset() is used to
automatically dispose of the IRQ mapping if the probe fails or the
device is removed.

The manual call to irq_dispose_mapping() in the error path was redundant
as the reset action already triggers mt6363_irq_remove(). Furthermore,
the manual call incorrectly passed the hardware IRQ number (info->hwirq)
instead of the virtual IRQ mapping (info->virq).

Remove the redundant and incorrect manual disposal.

Fixes: 3c36965df808 ("regulator: Add support for MediaTek MT6363 SPMI PMIC Regulators")
Signed-off-by: Felix Gu <ustc.gu@gmail.com>
---
 drivers/regulator/mt6363-regulator.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/regulator/mt6363-regulator.c b/drivers/regulator/mt6363-regulator.c
index 03af5fa53600..0aebcbda0a19 100644
--- a/drivers/regulator/mt6363-regulator.c
+++ b/drivers/regulator/mt6363-regulator.c
@@ -899,10 +899,8 @@ static int mt6363_regulator_probe(struct platform_device *pdev)
 					     "Failed to map IRQ%d\n", info->hwirq);
 
 		ret = devm_add_action_or_reset(dev, mt6363_irq_remove, &info->virq);
-		if (ret) {
-			irq_dispose_mapping(info->hwirq);
+		if (ret)
 			return ret;
-		}
 
 		config.driver_data = info;
 		INIT_DELAYED_WORK(&info->oc_work, mt6363_oc_irq_enable_work);

---
base-commit: d4906ae14a5f136ceb671bb14cedbf13fa560da6
change-id: 20260223-mt6363-00cc406a11ec

Best regards,
-- 
Felix Gu <ustc.gu@gmail.com>

Re: [PATCH] regulator: mt6363: Fix incorrect and redundant IRQ disposal in probe

[Mark Brown]

On Mon, 23 Feb 2026 02:24:34 +0800, Felix Gu wrote:
> In mt6363_regulator_probe(), devm_add_action_or_reset() is used to
> automatically dispose of the IRQ mapping if the probe fails or the
> device is removed.
> 
> The manual call to irq_dispose_mapping() in the error path was redundant
> as the reset action already triggers mt6363_irq_remove(). Furthermore,
> the manual call incorrectly passed the hardware IRQ number (info->hwirq)
> instead of the virtual IRQ mapping (info->virq).
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-next

Thanks!

[1/1] regulator: mt6363: Fix incorrect and redundant IRQ disposal in probe
      commit: 23942b71f07cc99e39d9216a5b370df494759d8c

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark