]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
iio: proximity: vl53l0x-i2c: Fix error code in probe()
authorDan Carpenter <dan.carpenter@linaro.org>
Tue, 19 Aug 2025 15:02:53 +0000 (18:02 +0300)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Mon, 25 Aug 2025 08:24:19 +0000 (09:24 +0100)
Commit 65e8202f0322 ("iio: Remove error prints for
devm_add_action_or_reset()") accidentally introduced a bug where we
returned "ret" but the error code was stored in "error" if
devm_add_action_or_reset() failed.  Using two variables to store error
codes is unnecessary and confusing.  Delete the "error" variable and use
"ret" everywhere instead.

Fixes: 65e8202f0322 ("iio: Remove error prints for devm_add_action_or_reset()")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Reviewed-by: Andy Shevchenko <andy@kernel.org>
Link: https://patch.msgid.link/aKSSHTdJf5QoYiRx@stanley.mountain
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/proximity/vl53l0x-i2c.c

index 696340ec027ae97e795a8cfcb1404a489f722ec0..ad3e46d47fa8d6730e5289176b3945f7718c90f8 100644 (file)
@@ -311,7 +311,6 @@ static int vl53l0x_probe(struct i2c_client *client)
 {
        struct vl53l0x_data *data;
        struct iio_dev *indio_dev;
-       int error;
        int ret;
 
        indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
@@ -344,13 +343,13 @@ static int vl53l0x_probe(struct i2c_client *client)
                return dev_err_probe(&client->dev, PTR_ERR(data->reset_gpio),
                                     "Cannot get reset GPIO\n");
 
-       error = vl53l0x_power_on(data);
-       if (error)
-               return dev_err_probe(&client->dev, error,
+       ret = vl53l0x_power_on(data);
+       if (ret)
+               return dev_err_probe(&client->dev, ret,
                                     "Failed to power on the chip\n");
 
-       error = devm_add_action_or_reset(&client->dev, vl53l0x_power_off, data);
-       if (error)
+       ret = devm_add_action_or_reset(&client->dev, vl53l0x_power_off, data);
+       if (ret)
                return ret;
 
        indio_dev->name = "vl53l0x";