summaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorNicolas Boichat <drinkcat@chromium.org>2018-10-22 10:55:06 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-02-27 10:08:51 +0100
commit14da7f159711d05be918156ee2e6e02482d82271 (patch)
treeb09e87f89bdb6aef6f429d29917533830ddbf737 /drivers/mfd
parent9bf045ff761a592e684f2befaba0e78feb7bbdbc (diff)
downloadlinux-stable-14da7f159711d05be918156ee2e6e02482d82271.tar.gz
linux-stable-14da7f159711d05be918156ee2e6e02482d82271.tar.bz2
linux-stable-14da7f159711d05be918156ee2e6e02482d82271.zip
mfd: mt6397: Do not call irq_domain_remove if PMIC unsupported
[ Upstream commit a177276aa098aa47a100d51a13eaaef029604b6d ] 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> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/mt6397-core.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mfd/mt6397-core.c b/drivers/mfd/mt6397-core.c
index 77b64bd64df3..ab24e176ef44 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) {