linux-kernel - [PATCH v2] iio: adc: ad799x: Add a single error handling block at the end of the function.

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:   Sun, 12 Sep 2021 14:41:01 +0800
From:   Cai Huoqing <caihuoqing@...du.com>
To:     <lars@...afoo.de>, <Michael.Hennerich@...log.com>,
        <jic23@...nel.org>
CC:     <linux-iio@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
        Cai Huoqing <caihuoqing@...du.com>
Subject: [PATCH v2] iio: adc: ad799x: Add a single error handling block at the end of the function.

A single error handling block at the end of the function could
be brought in to make code a little more concise.

Signed-off-by: Cai Huoqing <caihuoqing@...du.com>
---
v1->v2:
Change the error path-error_disable_reg from "st->vref" to "st->reg".

 drivers/iio/adc/ad799x.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/drivers/iio/adc/ad799x.c b/drivers/iio/adc/ad799x.c
index 18bf8386d50a..d3dbc4c1e375 100644
--- a/drivers/iio/adc/ad799x.c
+++ b/drivers/iio/adc/ad799x.c
@@ -891,20 +891,23 @@ static int __maybe_unused ad799x_resume(struct device *dev)
 	}
 	ret = regulator_enable(st->vref);
 	if (ret) {
-		regulator_disable(st->reg);
 		dev_err(dev, "Unable to enable vref regulator\n");
-		return ret;
+		goto error_disable_reg;
 	}
 
 	/* resync config */
 	ret = ad799x_update_config(st, st->config);
-	if (ret) {
-		regulator_disable(st->vref);
-		regulator_disable(st->reg);
-		return ret;
-	}
+	if (ret)
+		goto error_disable_vref;
 
 	return 0;
+
+error_disable_vref:
+	regulator_disable(st->vref);
+error_disable_reg:
+	regulator_disable(st->reg);
+
+	return ret;
 }
 
 static SIMPLE_DEV_PM_OPS(ad799x_pm_ops, ad799x_suspend, ad799x_resume);
-- 
2.25.1