2018-10-22 03:04:49

by Nicolas Boichat

Subject: [PATCH] mfd: mt6397: Do not call irq_domain_remove if PMIC unsupported

If the PMIC ID is unknown, the current code would call
irq_domain_remove and panic, as pmic->irq_domain is only
initialized by mt6397_irq_init.

Return immediately with an error, if the chip ID is unsupported.

Signed-off-by: Nicolas Boichat <[email protected]>
---
drivers/mfd/mt6397-core.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/mfd/mt6397-core.c b/drivers/mfd/mt6397-core.c
index 77b64bd64df36a..ab24e176ef4487 100644
--- a/drivers/mfd/mt6397-core.c
+++ b/drivers/mfd/mt6397-core.c
@@ -329,8 +329,7 @@ static int mt6397_probe(struct platform_device *pdev)

default:
dev_err(&pdev->dev, "unsupported chip: %d\n", id);
- ret = -ENODEV;
- break;
+ return -ENODEV;
}

if (ret) {
--
2.19.1.568.g152ad8e336-goog

2018-10-25 09:10:46

by Lee Jones

Subject: Re: [PATCH] mfd: mt6397: Do not call irq_domain_remove if PMIC unsupported

On Mon, 22 Oct 2018, Nicolas Boichat wrote:

> If the PMIC ID is unknown, the current code would call
> irq_domain_remove and panic, as pmic->irq_domain is only
> initialized by mt6397_irq_init.
>
> Return immediately with an error, if the chip ID is unsupported.
>
> Signed-off-by: Nicolas Boichat <[email protected]>
> ---
> drivers/mfd/mt6397-core.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)

Applied for v4.21, thanks.

--
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog