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

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
...@@ -1277,7 +1277,7 @@ static int sca3000_configure_ring(struct iio_dev *indio_dev) ...@@ -1277,7 +1277,7 @@ static int sca3000_configure_ring(struct iio_dev *indio_dev)
{ {
struct iio_buffer *buffer; struct iio_buffer *buffer;
buffer = iio_kfifo_allocate(); buffer = devm_iio_kfifo_allocate(&indio_dev->dev);
if (!buffer) if (!buffer)
return -ENOMEM; return -ENOMEM;
...@@ -1287,11 +1287,6 @@ static int sca3000_configure_ring(struct iio_dev *indio_dev) ...@@ -1287,11 +1287,6 @@ static int sca3000_configure_ring(struct iio_dev *indio_dev)
return 0; return 0;
} }
static void sca3000_unconfigure_ring(struct iio_dev *indio_dev)
{
iio_kfifo_free(indio_dev->buffer);
}
static inline static inline
int __sca3000_hw_ring_state_set(struct iio_dev *indio_dev, bool state) 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) ...@@ -1546,8 +1541,6 @@ static int sca3000_remove(struct spi_device *spi)
if (spi->irq) if (spi->irq)
free_irq(spi->irq, indio_dev); free_irq(spi->irq, indio_dev);
sca3000_unconfigure_ring(indio_dev);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment