From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 22C36C43381 for ; Mon, 25 Feb 2019 22:01:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D96E22146F for ; Mon, 25 Feb 2019 22:01:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551132114; bh=o0jigkp/NdU7ATcHkNY85ysuEGc9I2Z/6Z3LZJDLtd0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=IXidP28oDnAaHKEc/+/RFRRc5QC+KmenjXdD638kOl0yoarkvwqLZlMlFZS1KAOEy rTnKqbJT4Cewm/Tq8+XhBqYQQlKoGvTAuu12T4Dz51iHVJQNt2I5TWcD1jiA7oM0xw ROtWBzcE/nROuoqHX/epKX1ktW0ds8S5bm/IyaGg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730140AbfBYWBw (ORCPT ); Mon, 25 Feb 2019 17:01:52 -0500 Received: from mail.kernel.org ([198.145.29.99]:48136 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729223AbfBYVQ0 (ORCPT ); Mon, 25 Feb 2019 16:16:26 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CE52F2147C; Mon, 25 Feb 2019 21:16:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551129386; bh=o0jigkp/NdU7ATcHkNY85ysuEGc9I2Z/6Z3LZJDLtd0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u+d3+uFKHjLrEInNYShxH7b7F8TkJVjRWTTnEGh3bzkbM0+cbGQU7qAoTTHA4RqHE CeI/NGGBKw9x5mb6zXALuCs453F6gDRbzhFOatcM/Gfup1n7aVvHXqVS/ATETMmOvt 9YE4zQUir8eiAWFFMCYmKK3g4RKmARO8g3mHrrhg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nicolas Boichat , Lee Jones , Sasha Levin Subject: [PATCH 4.14 15/71] mfd: mt6397: Do not call irq_domain_remove if PMIC unsupported Date: Mon, 25 Feb 2019 22:11:17 +0100 Message-Id: <20190225195035.675865406@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190225195034.555044862@linuxfoundation.org> References: <20190225195034.555044862@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ [ 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 Signed-off-by: Lee Jones Signed-off-by: Sasha Levin --- drivers/mfd/mt6397-core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/mfd/mt6397-core.c b/drivers/mfd/mt6397-core.c index 04a601f6aebe5..0afadea996bbd 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) { -- 2.19.1