Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e319cec authored by Sachin Kamat's avatar Sachin Kamat Committed by Jonathan Cameron
Browse files

staging: iio: ad7192: Use devm_* APIs and fix a memory leak 



devm_* APIs are device managed and make code simpler.

The memory leak was a lack of freeing the iio_dev structure in the
remove function.

Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 6898eb89

drivers/staging/iio/adc/ad7192.c

+4 −11
Original line number Original line Diff line number Diff line
@@ -623,17 +623,17 @@ static int ad7192_probe(struct spi_device *spi) 
		return -ENODEV;

		return -ENODEV;

	}

	}





	indio_dev = iio_device_alloc(sizeof(*st));

	indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));

	if (indio_dev == NULL)

	if (indio_dev == NULL)

		return -ENOMEM;

		return -ENOMEM;





	st = iio_priv(indio_dev);

	st = iio_priv(indio_dev);





	st->reg = regulator_get(&spi->dev, "vcc");

	st->reg = devm_regulator_get(&spi->dev, "vcc");

	if (!IS_ERR(st->reg)) {

	if (!IS_ERR(st->reg)) {

		ret = regulator_enable(st->reg);

		ret = regulator_enable(st->reg);

		if (ret)

		if (ret)

			goto error_put_reg;

			return ret;





		voltage_uv = regulator_get_voltage(st->reg);

		voltage_uv = regulator_get_voltage(st->reg);

	}

	}
@@ -677,11 +677,6 @@ static int ad7192_probe(struct spi_device *spi) 
error_disable_reg:

error_disable_reg:

	if (!IS_ERR(st->reg))

	if (!IS_ERR(st->reg))

		regulator_disable(st->reg);

		regulator_disable(st->reg);

error_put_reg:

	if (!IS_ERR(st->reg))

		regulator_put(st->reg);



	iio_device_free(indio_dev);





	return ret;

	return ret;

}

}
@@ -694,10 +689,8 @@ static int ad7192_remove(struct spi_device *spi) 
	iio_device_unregister(indio_dev);

	iio_device_unregister(indio_dev);

	ad_sd_cleanup_buffer_and_trigger(indio_dev);

	ad_sd_cleanup_buffer_and_trigger(indio_dev);





	if (!IS_ERR(st->reg)) {

	if (!IS_ERR(st->reg))

		regulator_disable(st->reg);

		regulator_disable(st->reg);

		regulator_put(st->reg);

	}





	return 0;

	return 0;

}

}