From: Amelie Delaunay <[email protected]>

[ Upstream commit d75846ed08e6f4135ec73778575c34d9c0ace993 ]

'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 <[email protected]>
Signed-off-by: Lee Jones <[email protected]>
Signed-off-by: Sasha Levin <[email protected]>
---
 drivers/mfd/stmfx.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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) {
-- 
2.27.0



Reply via email to