]> git.ipfire.org Git - people/arne_f/kernel.git/commitdiff
mfd: mt6397: Do not call irq_domain_remove if PMIC unsupported
authorNicolas Boichat <drinkcat@chromium.org>
Mon, 22 Oct 2018 02:55:06 +0000 (10:55 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 27 Feb 2019 09:08:02 +0000 (10:08 +0100)
[ 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>
drivers/mfd/mt6397-core.c

index 04a601f6aebe500d5491acfbbb4c68d7b56b9a73..0afadea996bbd5824a20e3aacc167566d1f32b9a 100644 (file)
@@ -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) {