From nobody Wed Dec 17 23:55:14 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9067FC77B61 for ; Sun, 16 Apr 2023 07:25:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230213AbjDPHZs (ORCPT ); Sun, 16 Apr 2023 03:25:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35478 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229662AbjDPHZq (ORCPT ); Sun, 16 Apr 2023 03:25:46 -0400 Received: from hust.edu.cn (unknown [202.114.0.240]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 67EE390; Sun, 16 Apr 2023 00:25:45 -0700 (PDT) Received: from ubuntu.localdomain ([10.12.172.250]) (user=jkluo@hust.edu.cn mech=LOGIN bits=0) by mx1.hust.edu.cn with ESMTP id 33G7NMQ3019680-33G7NMQ4019680 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Sun, 16 Apr 2023 15:23:28 +0800 From: Jiakai Luo To: Jonathan Cameron , Lars-Peter Clausen , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Ksenija Stanojevic , Lee Jones , Marek Vasut Cc: Jiakai Luo , linux-iio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] iio: adc: mxs-lradc: fix the order of two cleanup operations Date: Sun, 16 Apr 2023 00:21:57 -0700 Message-Id: <20230416072157.57388-1-jkluo@hust.edu.cn> X-Mailer: git-send-email 2.17.1 X-FEAS-AUTH-USER: jkluo@hust.edu.cn Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Smatch reports: drivers/iio/adc/mxs-lradc-adc.c:766 mxs_lradc_adc_probe() warn: missing unwind goto? the order of three init operation: 1.mxs_lradc_adc_trigger_init 2.iio_triggered_buffer_setup 3.mxs_lradc_adc_hw_init thus, the order of three cleanup operation should be: 1.mxs_lradc_adc_hw_stop 2.iio_triggered_buffer_cleanup 3.mxs_lradc_adc_trigger_remove we exchange the order of two cleanup operations, introducing the following differences: 1.if mxs_lradc_adc_trigger_init fails, returns directly; 2.if trigger_init succeeds but iio_triggered_buffer_setup fails, goto err_trig and remove the trigger. v1->v2: exchange the order of mxs_lradc_adc_trigger_remove() and iio_triggered_buffer_cleanup() in error handling labels Fixes: 6dd112b9f85e ("iio: adc: mxs-lradc: Add support for ADC driver") Signed-off-by: Jiakai Luo Reviewed-by: Dongliang Mu --- drivers/iio/adc/mxs-lradc-adc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/iio/adc/mxs-lradc-adc.c b/drivers/iio/adc/mxs-lradc-ad= c.c index bca79a93cbe4..d32e9b1d03ce 100644 --- a/drivers/iio/adc/mxs-lradc-adc.c +++ b/drivers/iio/adc/mxs-lradc-adc.c @@ -757,13 +757,13 @@ static int mxs_lradc_adc_probe(struct platform_device= *pdev) =20 ret =3D mxs_lradc_adc_trigger_init(iio); if (ret) - goto err_trig; + return ret; =20 ret =3D iio_triggered_buffer_setup(iio, &iio_pollfunc_store_time, &mxs_lradc_adc_trigger_handler, &mxs_lradc_adc_buffer_ops); if (ret) - return ret; + goto err_trig; =20 adc->vref_mv =3D mxs_lradc_adc_vref_mv[lradc->soc]; =20 @@ -801,9 +801,9 @@ static int mxs_lradc_adc_probe(struct platform_device *= pdev) =20 err_dev: mxs_lradc_adc_hw_stop(adc); - mxs_lradc_adc_trigger_remove(iio); -err_trig: iio_triggered_buffer_cleanup(iio); +err_trig: + mxs_lradc_adc_trigger_remove(iio); return ret; } =20 --=20 2.17.1