summaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorAmelie Delaunay <amelie.delaunay@st.com>2020-11-13 13:27:25 +0100
committerLee Jones <lee.jones@linaro.org>2020-11-19 09:34:28 +0100
commitd75846ed08e6f4135ec73778575c34d9c0ace993 (patch)
treeeb31e7fa74a2d752637efe42b781ae31a731087a /drivers/mfd
parentmfd: MFD_SL28CPLD should depend on ARCH_LAYERSCAPE (diff)
downloadlinux-d75846ed08e6f4135ec73778575c34d9c0ace993.tar.xz
linux-d75846ed08e6f4135ec73778575c34d9c0ace993.zip
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>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/stmfx.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/mfd/stmfx.c b/drivers/mfd/stmfx.c
index 5e680bfdf5c9..988e2ba6dd0f 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) {