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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 16D02C282CA for ; Wed, 13 Feb 2019 02:50:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D0F8521934 for ; Wed, 13 Feb 2019 02:50:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550026207; bh=t+XiMneW0cid8WXW+9B0x76GTuxULL2etOXRntrVyqo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=TDMnoYt3TkKx+HBgiKpPt4WyVmhkKOOniXXSXMNZN1Dh7U23Zp3kTjdeVypQLPKP6 MrrxX7oT/ranhJW9U5pcec7TuW76LQSggPzArdL6SfNUDHVyhakbv0NBDLAP5Iv/+4 AfbGg3/aKII0k6osscpJ6qmex44snI+5yxLpFtMg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389049AbfBMCuH (ORCPT ); Tue, 12 Feb 2019 21:50:07 -0500 Received: from mail.kernel.org ([198.145.29.99]:43616 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388853AbfBMCj7 (ORCPT ); Tue, 12 Feb 2019 21:39:59 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6430A222C9; Wed, 13 Feb 2019 02:39:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550025599; bh=t+XiMneW0cid8WXW+9B0x76GTuxULL2etOXRntrVyqo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QcpiTDAuK8X+ERyWbTMvV9z05G7fy1GQdj9kqSKxnr/F0FDbHKoz6rGgpMPxie9QP zgQyz7iKBW3YM97mjrA2AD7c86d2Qv0A1u+9QjGs1vFKjQqqRlPjyvLWkpJwGO375V OD1vXNjVsCqdfoc2QE3oau7WhZFHZ5S0Y5P1ba2w= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Nicolas Boichat , Lee Jones , Sasha Levin Subject: [PATCH AUTOSEL 4.14 05/34] mfd: mt6397: Do not call irq_domain_remove if PMIC unsupported Date: Tue, 12 Feb 2019 21:39:23 -0500 Message-Id: <20190213023952.21311-5-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190213023952.21311-1-sashal@kernel.org> References: <20190213023952.21311-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Nicolas Boichat [ 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 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) { -- 2.19.1