If st_magn_common_probe function fails, the device must be freed. Added devm_iio_device_free also on common_remove function. Signed-off-by: Denis Ciocca <denis.ciocca@xxxxxx> --- drivers/iio/magnetometer/st_magn_core.c | 1 + drivers/iio/magnetometer/st_magn_i2c.c | 6 +++++- drivers/iio/magnetometer/st_magn_spi.c | 6 +++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/iio/magnetometer/st_magn_core.c b/drivers/iio/magnetometer/st_magn_core.c index 52bbcfa..018f01c 100644 --- a/drivers/iio/magnetometer/st_magn_core.c +++ b/drivers/iio/magnetometer/st_magn_core.c @@ -408,6 +408,7 @@ void st_magn_common_remove(struct iio_dev *indio_dev) st_sensors_deallocate_trigger(indio_dev); st_magn_deallocate_ring(indio_dev); + devm_iio_device_free(mdata->dev, indio_dev); } EXPORT_SYMBOL(st_magn_common_remove); diff --git a/drivers/iio/magnetometer/st_magn_i2c.c b/drivers/iio/magnetometer/st_magn_i2c.c index 892e0fe..5e33e2d 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_free(&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..09c5845 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_free(&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
