From: Nicolas Boichat <drinkcat@chromium.org>
Date: Mon, 22 Oct 2018 02:55:06 +0000 (+0800)
Subject: mfd: mt6397: Do not call irq_domain_remove if PMIC unsupported
X-Git-Tag: v5.0-rc3~43^2~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a177276aa098aa47a100d51a13eaaef029604b6d;p=thirdparty%2Fkernel%2Flinux.git

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 <drinkcat@chromium.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---

diff --git a/drivers/mfd/mt6397-core.c b/drivers/mfd/mt6397-core.c
index 77b64bd64df36..ab24e176ef448 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) {