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

Commit 4a5b4538 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Jonathan Cameron
Browse files

iio: sca3000: Fix an error handling path in 'sca3000_probe()' 



Use 'devm_iio_kfifo_allocate()' instead of 'iio_kfifo_allocate()' in order
to simplify code and avoid a memory leak in an error path in
'sca3000_probe()'. A call to 'sca3000_unconfigure_ring()' was missing.

Sent via the next merge window as unimportant bug and there are
other patches dependent on it.

Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: <Stable@vger.kernel.org>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 4177381b

drivers/iio/accel/sca3000.c

+1 −8
Original line number Diff line number Diff line
@@ -1277,7 +1277,7 @@ static int sca3000_configure_ring(struct iio_dev *indio_dev) 
{

	struct iio_buffer *buffer;



	buffer = iio_kfifo_allocate();

	buffer = devm_iio_kfifo_allocate(&indio_dev->dev);

	if (!buffer)

		return -ENOMEM;
@@ -1287,11 +1287,6 @@ static int sca3000_configure_ring(struct iio_dev *indio_dev) 
	return 0;

}



static void sca3000_unconfigure_ring(struct iio_dev *indio_dev)

{

	iio_kfifo_free(indio_dev->buffer);

}



static inline

int __sca3000_hw_ring_state_set(struct iio_dev *indio_dev, bool state)

{
@@ -1546,8 +1541,6 @@ static int sca3000_remove(struct spi_device *spi) 
	if (spi->irq)

		free_irq(spi->irq, indio_dev);



	sca3000_unconfigure_ring(indio_dev);



	return 0;

}