If st_magn_common_probe function fails, the device must be unregistered.
Used devm_iio_device_unregister function instead of iio_device_unregister
also in the common remove function.
Signed-off-by: Denis Ciocca <denis.ciocca@xxxxxx>
---
drivers/iio/magnetometer/st_magn_core.c | 2 +-
drivers/iio/magnetometer/st_magn_i2c.c | 6 +++++-
drivers/iio/magnetometer/st_magn_spi.c | 6 +++++-
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/drivers/iio/magnetometer/st_magn_core.c b/drivers/iio/magnetometer/st_magn_core.c
index 52bbcfa..344b9cd 100644
--- a/drivers/iio/magnetometer/st_magn_core.c
+++ b/drivers/iio/magnetometer/st_magn_core.c
@@ -403,7 +403,7 @@ void st_magn_common_remove(struct iio_dev *indio_dev)
{
struct st_sensor_data *mdata = iio_priv(indio_dev);
- iio_device_unregister(indio_dev);
+ devm_iio_device_unregister(mdata->dev, indio_dev);
if (mdata->get_irq_data_ready(indio_dev) > 0)
st_sensors_deallocate_trigger(indio_dev);
diff --git a/drivers/iio/magnetometer/st_magn_i2c.c b/drivers/iio/magnetometer/st_magn_i2c.c
index 892e0fe..02c6da1 100644
--- a/drivers/iio/magnetometer/st_magn_i2c.c
+++ b/drivers/iio/magnetometer/st_magn_i2c.c
@@ -36,9 +36,13 @@ static int st_magn_i2c_probe(struct i2c_client *client,
err = st_magn_common_probe(indio_dev, NULL);
if (err < 0)
- return err;
+ goto device_unregister;
return 0;
+
+device_unregister:
+ devm_iio_device_unregister(&client->dev, indio_dev);
+ return err;
}
static int st_magn_i2c_remove(struct i2c_client *client)
diff --git a/drivers/iio/magnetometer/st_magn_spi.c b/drivers/iio/magnetometer/st_magn_spi.c
index a6143ea..5c2f6fa 100644
--- a/drivers/iio/magnetometer/st_magn_spi.c
+++ b/drivers/iio/magnetometer/st_magn_spi.c
@@ -35,9 +35,13 @@ static int st_magn_spi_probe(struct spi_device *spi)
err = st_magn_common_probe(indio_dev, NULL);
if (err < 0)
- return err;
+ goto device_unregister;
return 0;
+
+device_unregister:
+ devm_iio_device_unregister(&spi->dev, indio_dev);
+ return err;
}
static int st_magn_spi_remove(struct spi_device *spi)
--
1.8.5.4
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
