| Message ID | 20230609092804.793100-2-amelie.delaunay@foss.st.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [RESEND,1/2] mfd: stmfx: Fix error path in stmfx_chip_init | expand |
On Fri, 09 Jun 2023, Amelie Delaunay wrote: > Nullify stmfx->vdd in case devm_regulator_get_optional() returns an error. > And simplify code by returning an error only if return code is not -ENODEV, > which means there is no vdd regulator and it is not an issue. > > Fixes: d75846ed08e6 ("mfd: stmfx: Fix dev_err_probe() call in stmfx_chip_init()") > Signed-off-by: Amelie Delaunay <amelie.delaunay@foss.st.com> > --- > drivers/mfd/stmfx.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) Applied, thanks
diff --git a/drivers/mfd/stmfx.c b/drivers/mfd/stmfx.c index 54cc902cb578..c02cbd9c2f5d 100644 --- a/drivers/mfd/stmfx.c +++ b/drivers/mfd/stmfx.c @@ -330,9 +330,8 @@ 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) { - if (ret == -ENODEV) - stmfx->vdd = NULL; - else + stmfx->vdd = NULL; + if (ret != -ENODEV) return dev_err_probe(&client->dev, ret, "Failed to get VDD regulator\n"); }
Nullify stmfx->vdd in case devm_regulator_get_optional() returns an error. And simplify code by returning an error only if return code is not -ENODEV, which means there is no vdd regulator and it is not an issue. Fixes: d75846ed08e6 ("mfd: stmfx: Fix dev_err_probe() call in stmfx_chip_init()") Signed-off-by: Amelie Delaunay <amelie.delaunay@foss.st.com> --- drivers/mfd/stmfx.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)