diff options
author | Nicolas Boichat <drinkcat@chromium.org> | 2018-10-22 10:55:06 +0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-02-27 10:08:02 +0100 |
commit | bf0abe19df03fe398c7bc4fec954469d9ab467f0 (patch) | |
tree | fb8056fc2179966f9be1e3f09c77d7fdba2e1071 /drivers/mfd | |
parent | 9856cd1a04dc15f8199147caf3f7e8ba2864cb15 (diff) | |
download | linux-stable-bf0abe19df03fe398c7bc4fec954469d9ab467f0.tar.gz linux-stable-bf0abe19df03fe398c7bc4fec954469d9ab467f0.tar.bz2 linux-stable-bf0abe19df03fe398c7bc4fec954469d9ab467f0.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.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mfd/mt6397-core.c b/drivers/mfd/mt6397-core.c index 04a601f6aebe..0afadea996bb 100644 --- a/drivers/mfd/mt6397-core.c +++ b/drivers/mfd/mt6397-core.c @@ -309,8 +309,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) { |