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.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 E3FEDC282C4 for ; Wed, 13 Feb 2019 03:05:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B4489207E0 for ; Wed, 13 Feb 2019 03:05:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550027121; bh=mXs3VpGKisMeOjWUsx7te6PvEpSfxm7cG64xLhWBYpQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=dbKGkuUBG0+4aRhivADhudaXnJjpBydKxQXYwvuPsnd/ggy/ZMSrhD700Z9hYa7o6 HMZefzlskqU8RTsRGYQLtIhZTSDdpK3NL3xhylpjfW1hWwnWe4+Yw+hCGO2bqW/F6i T9sjlT6OEKlYuT1YVh4uvAi1rlSH9RHvNuq6kd8o= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387524AbfBMCd6 (ORCPT ); Tue, 12 Feb 2019 21:33:58 -0500 Received: from mail.kernel.org ([198.145.29.99]:37392 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731487AbfBMCdq (ORCPT ); Tue, 12 Feb 2019 21:33:46 -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 8159F222BA; Wed, 13 Feb 2019 02:33:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550025226; bh=mXs3VpGKisMeOjWUsx7te6PvEpSfxm7cG64xLhWBYpQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1EPsVquZ6Dq4PKuiddrn6697M6+Z+KAn16pu6oLoplpVhelYmT9Hy1eH6iUtxAxiU jLGP3doQcsiNei+YheObSsIguQ6+G4O/NmwXyoGYz8FJpphsxLK6zMjJrLchVB5ftu 7nXHHGebW0+w3N0r6vrxysD/U7d7xf8nf16PzwH0= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Nicolas Boichat , Lee Jones , Sasha Levin Subject: [PATCH AUTOSEL 4.20 009/105] mfd: mt6397: Do not call irq_domain_remove if PMIC unsupported Date: Tue, 12 Feb 2019 21:32:00 -0500 Message-Id: <20190213023336.19019-9-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190213023336.19019-1-sashal@kernel.org> References: <20190213023336.19019-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 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) { -- 2.19.1