| Message ID | 20201113122725.12971-1-amelie.delaunay@st.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2,1/1] mfd: stmfx: fix dev_err_probe call in stmfx_chip_init | expand |
On Fri, 13 Nov 2020, Amelie Delaunay wrote: > 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> > --- > v2: address Lee's comment about error handling area > --- > drivers/mfd/stmfx.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) Applied, thanks.
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) {
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> --- v2: address Lee's comment about error handling area --- drivers/mfd/stmfx.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)