| From 0cacb5dc39c5f84d901869628aaa2c86e43337a6 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 9 Jun 2023 11:28:04 +0200 |
| Subject: mfd: stmfx: Nullify stmfx->vdd in case of error |
| |
| From: Amelie Delaunay <amelie.delaunay@foss.st.com> |
| |
| [ Upstream commit 7c81582c0bccb4757186176f0ee12834597066ad ] |
| |
| 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> |
| Link: https://lore.kernel.org/r/20230609092804.793100-2-amelie.delaunay@foss.st.com |
| Signed-off-by: Lee Jones <lee@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/mfd/stmfx.c | 5 ++--- |
| 1 file changed, 2 insertions(+), 3 deletions(-) |
| |
| diff --git a/drivers/mfd/stmfx.c b/drivers/mfd/stmfx.c |
| index 61a8aad564a4e..b1ecd85ad2a8a 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"); |
| } |
| |
| -- |
| 2.39.2 |
| |
