Merge tag 'nfsd-5.10' of git://linux-nfs.org/~bfields/linux

[linux-2.6-microblaze.git] / drivers / mfd / stmfx.c

diff --git a/drivers/mfd/stmfx.c b/drivers/mfd/stmfx.c
index 711979a..5e680bf 100644 (file)
--- a/drivers/mfd/stmfx.c
+++ b/drivers/mfd/stmfx.c
@@ -331,11 +331,9 @@ static int stmfx_chip_init(struct i2c_client *client)
        ret = PTR_ERR_OR_ZERO(stmfx->vdd);
        if (ret == -ENODEV) {
                stmfx->vdd = NULL;
-       } else if (ret == -EPROBE_DEFER) {
-               return ret;
-       } else if (ret) {
-               dev_err(&client->dev, "Failed to get VDD regulator: %d\n", ret);
-               return ret;
+       } else {
+               return dev_err_probe(&client->dev, ret,
+                                    "Failed to get VDD regulator\n");
        }
 
        if (stmfx->vdd) {