| Message ID | 20181022025505.27919-1-drinkcat@chromium.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | mfd: mt6397: Do not call irq_domain_remove if PMIC unsupported | expand |
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 <drinkcat@chromium.org> > --- > drivers/mfd/mt6397-core.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) Applied for v4.21, thanks.
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) {
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 <drinkcat@chromium.org> --- drivers/mfd/mt6397-core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)