From patchwork Mon Oct 24 11:31:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8972 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp437882wru; Mon, 24 Oct 2022 06:00:36 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6gJ0dd4v9bCc74PBTR8owNvy5Z6AwIdwEgpZKZ8T4I/XFRcRYh4J0+snocsmQYcCEffsd+ X-Received: by 2002:a17:90b:4d84:b0:212:c78f:8d6e with SMTP id oj4-20020a17090b4d8400b00212c78f8d6emr21781222pjb.201.1666616436075; Mon, 24 Oct 2022 06:00:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666616436; cv=none; d=google.com; s=arc-20160816; b=KUSL9WjG0op7oYabzd32CvgFounN2VuyDkz7tOXPbOkvkGZKxf0TYXen9FzWN8lVDT vICaVIykeiGZKAynXXhQ02BuRU4BE2LU0rERf7C7szMny/wvGd4dmue3fJm6y0Qkfcmv 2yBbCKuYQQUXXjHL7uhX2nX5BU4UzfROwXtdEDdY9i2TZBNW+eVbsHNmmB7zMidBGKVw 9lFAC43i8YP1ppuT9DRlDNmLn+wmLuR5mjKZF3dnaqbANpYGE2BodKG0w0OvfUIRxf3H 2YsqFnV9XqfWkl7ZbC0BMnjUuwwI29mFE0s7ckm68f9tra69OPZGk7cNwC5inCHFuG0F iCaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=fcI3k15DIZHI6L/UoW0KlIMKvdVwbLy0Lc8HivKBdx8=; b=jZ9XBxIDSlljc8H7FWoqrOJxXipdEs3e97gkJdOhJEL6PSH2Qcdkk0Wx8uJSQAv1As /UHonaNwEiGLkpaz+Ig2RrERFdTrz9AjLqpJiXXCiZfJKWD7y+wYvyHxNtXCjeWh8q99 ov9roxSSzLluxpaQEKclP6G7Mxud0DCRijS8PS7vdvPVX7iKgaip07B+H/YcUClo/6O5 XP2Hr20nme8LMrBWkQOZ5ehvaExVWjlzFsQqHU8ceSLeRpkq0BqianCljU65C1OYGqUW hsXxyjOYc9hWCg3CcYVh9oB9AaET3YFhD0YHqso2hOX6bVQSZe6i19XuJI9AAf27W/dI bZew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Pc6JA6IA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h9-20020a170902f70900b00186b46df624si1211858plo.424.2022.10.24.06.00.16; Mon, 24 Oct 2022 06:00:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Pc6JA6IA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234723AbiJXM5A (ORCPT + 99 others); Mon, 24 Oct 2022 08:57:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60862 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234712AbiJXM4c (ORCPT ); Mon, 24 Oct 2022 08:56:32 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1B3068D0D6; Mon, 24 Oct 2022 05:15:56 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 312BE61291; Mon, 24 Oct 2022 12:12:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 468F3C433C1; Mon, 24 Oct 2022 12:12:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666613573; bh=72IdrIRDfHiRyzadDUK1d/TKQj32QPvspPY4OjhOf2M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Pc6JA6IAVaTEQClLtRlLwjFsEgJtb2J8tWxE8iJcjkF7QVHqrxdG8huKrsYdNJYFG olgBl/pUd7APmUk8EbA1yEH21A2YBcP3vEo5ozlAxakt+lU0ez1XikHhYWmVHm7atB MX4z4+tTNN4Bb+2cq1Bew+ylqpQ5MYFIRllO3w3o= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christophe JAILLET , Lee Jones , Sasha Levin Subject: [PATCH 5.4 158/255] mfd: fsl-imx25: Fix an error handling path in mx25_tsadc_setup_irq() Date: Mon, 24 Oct 2022 13:31:08 +0200 Message-Id: <20221024113007.902329329@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113002.471093005@linuxfoundation.org> References: <20221024113002.471093005@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747573995974696173?= X-GMAIL-MSGID: =?utf-8?q?1747573995974696173?= From: Christophe JAILLET [ Upstream commit 3fa9e4cfb55da512ebfd57336fde468830719298 ] If devm_of_platform_populate() fails, some resources need to be released. Introduce a mx25_tsadc_unset_irq() function that undoes mx25_tsadc_setup_irq() and call it both from the new error handling path of the probe and in the remove function. Fixes: a55196eff6d6 ("mfd: fsl-imx25: Use devm_of_platform_populate()") Signed-off-by: Christophe JAILLET Signed-off-by: Lee Jones Link: https://lore.kernel.org/r/d404e04828fc06bcfddf81f9f3e9b4babbe35415.1659269156.git.christophe.jaillet@wanadoo.fr Signed-off-by: Sasha Levin --- drivers/mfd/fsl-imx25-tsadc.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/drivers/mfd/fsl-imx25-tsadc.c b/drivers/mfd/fsl-imx25-tsadc.c index a016b39fe9b0..95103b2cc471 100644 --- a/drivers/mfd/fsl-imx25-tsadc.c +++ b/drivers/mfd/fsl-imx25-tsadc.c @@ -84,6 +84,19 @@ static int mx25_tsadc_setup_irq(struct platform_device *pdev, return 0; } +static int mx25_tsadc_unset_irq(struct platform_device *pdev) +{ + struct mx25_tsadc *tsadc = platform_get_drvdata(pdev); + int irq = platform_get_irq(pdev, 0); + + if (irq) { + irq_set_chained_handler_and_data(irq, NULL, NULL); + irq_domain_remove(tsadc->domain); + } + + return 0; +} + static void mx25_tsadc_setup_clk(struct platform_device *pdev, struct mx25_tsadc *tsadc) { @@ -171,18 +184,21 @@ static int mx25_tsadc_probe(struct platform_device *pdev) platform_set_drvdata(pdev, tsadc); - return devm_of_platform_populate(dev); + ret = devm_of_platform_populate(dev); + if (ret) + goto err_irq; + + return 0; + +err_irq: + mx25_tsadc_unset_irq(pdev); + + return ret; } static int mx25_tsadc_remove(struct platform_device *pdev) { - struct mx25_tsadc *tsadc = platform_get_drvdata(pdev); - int irq = platform_get_irq(pdev, 0); - - if (irq) { - irq_set_chained_handler_and_data(irq, NULL, NULL); - irq_domain_remove(tsadc->domain); - } + mx25_tsadc_unset_irq(pdev); return 0; }