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 8CCA5C43381 for ; Mon, 25 Feb 2019 21:52:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 592462083D for ; Mon, 25 Feb 2019 21:52:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551131549; bh=Ms0Vz06dSjsfK5r4nYcMg8GJE1hpSQLYegmii/pq9S4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=hMtn5TRUsE/opm3bFcREz9Y6TY+i0b4as2hcsp4PL2PPyB/oJ6eK+HgLR6m5yc4sB z4xafqVwHOmQBWK6UwwV+tUQ7udlV4f9+eJH/KWrZwGhFPi1RQwrnKlzS8GWKJmDLw 5e15VC7jg30CHRCDO//Jt04i0Z4Wkm9EMwtVJu64= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731086AbfBYVw1 (ORCPT ); Mon, 25 Feb 2019 16:52:27 -0500 Received: from mail.kernel.org ([198.145.29.99]:57128 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730966AbfBYVWs (ORCPT ); Mon, 25 Feb 2019 16:22:48 -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 AA7FF218AD; Mon, 25 Feb 2019 21:22:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551129768; bh=Ms0Vz06dSjsfK5r4nYcMg8GJE1hpSQLYegmii/pq9S4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Tt8SmBNr68OxcWi7jrkHtPHauYXhr9QTWoSqJ+wKK9LiQWSZzp5PT+DH5iChvoB7g 6uudCBm5xejEzVGlxaSU1LPgzB52aszTwgJxEG796xvHT9tvkUWdNh/4cNvyjKy4Vt loylgWPP/I6vaOE76XBE26qX9ATTrUDux2QRAUqs= 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.19 024/152] mfd: mt6397: Do not call irq_domain_remove if PMIC unsupported Date: Mon, 25 Feb 2019 22:10:16 +0100 Message-Id: <20190225195045.321503318@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190225195043.645958524@linuxfoundation.org> References: <20190225195043.645958524@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.19-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 77b64bd64df36..ab24e176ef448 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