From: Amelie Delaunay <amelie.delaunay@st.com>
Date: Fri, 13 Nov 2020 12:27:25 +0000 (+0100)
Subject: mfd: stmfx: Fix dev_err_probe() call in stmfx_chip_init()
X-Git-Tag: howlett/maple_spf/20210104~292^2~23
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d75846ed08e6f4135ec73778575c34d9c0ace993;p=users%2Fjedix%2Flinux-maple.git

mfd: stmfx: Fix dev_err_probe() call in stmfx_chip_init()

'ret' may be 0 so, dev_err_probe() should be called only when 'ret' is
an error code.

Fixes: 41c9c06c491a ("mfd: stmfx: Simplify with dev_err_probe()")
Signed-off-by: Amelie Delaunay <amelie.delaunay@st.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---

diff --git a/drivers/mfd/stmfx.c b/drivers/mfd/stmfx.c
index 5e680bfdf5c90..988e2ba6dd0f3 100644
--- a/drivers/mfd/stmfx.c
+++ b/drivers/mfd/stmfx.c
@@ -329,11 +329,11 @@ static int stmfx_chip_init(struct i2c_client *client)
 
 	stmfx->vdd = devm_regulator_get_optional(&client->dev, "vdd");
 	ret = PTR_ERR_OR_ZERO(stmfx->vdd);
-	if (ret == -ENODEV) {
-		stmfx->vdd = NULL;
-	} else {
-		return dev_err_probe(&client->dev, ret,
-				     "Failed to get VDD regulator\n");
+	if (ret) {
+		if (ret == -ENODEV)
+			stmfx->vdd = NULL;
+		else
+			return dev_err_probe(&client->dev, ret, "Failed to get VDD regulator\n");
 	}
 
 	if (stmfx->vdd) {