tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

iio: proximity: vl53l0x-i2c: Fix error code in probe()

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>

authored by

Dan Carpenter and committed by
Jonathan Cameron d20a8a8e 788c57f4

+5 -6
+5 -6
drivers/iio/proximity/vl53l0x-i2c.c
··· 311 311 { 312 312 struct vl53l0x_data *data; 313 313 struct iio_dev *indio_dev; 314 - int error; 315 314 int ret; 316 315 317 316 indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data)); ··· 343 344 return dev_err_probe(&client->dev, PTR_ERR(data->reset_gpio), 344 345 "Cannot get reset GPIO\n"); 345 346 346 - error = vl53l0x_power_on(data); 347 - if (error) 348 - return dev_err_probe(&client->dev, error, 347 + ret = vl53l0x_power_on(data); 348 + if (ret) 349 + return dev_err_probe(&client->dev, ret, 349 350 "Failed to power on the chip\n"); 350 351 351 - error = devm_add_action_or_reset(&client->dev, vl53l0x_power_off, data); 352 - if (error) 352 + ret = devm_add_action_or_reset(&client->dev, vl53l0x_power_off, data); 353 + if (ret) 353 354 return ret; 354 355 355 356 indio_dev->name = "vl53l0x";