diff options
| author | Amelie Delaunay <amelie.delaunay@st.com> | 2020-11-13 15:27:25 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-12-30 13:53:16 +0300 |
| commit | de39384806af37564a0fd6aef7557bf61cbde0e1 (patch) | |
| tree | f55f67e974bc4ae55804815a6ab73e9fdf6fc070 /drivers/mfd | |
| parent | b278cdb100399bbe233d8072d03884c52b7079fa (diff) | |
| download | linux-de39384806af37564a0fd6aef7557bf61cbde0e1.tar.xz | |
mfd: stmfx: Fix dev_err_probe() call in stmfx_chip_init()
[ 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 <amelie.delaunay@st.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/stmfx.c | 10 |
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) { |