[PATCH 1/2] iio: sca3000: Fix an error handling path in 'sca3000_probe()'

Christophe JAILLET
2018-04-02T16:59:47Z

In case of error, we must undo the previous 'sca3000_configure_ring()' call
in order to free some memory.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
drivers/iio/accel/sca3000.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/iio/accel/sca3000.c b/drivers/iio/accel/sca3000.c
index f33dadf7b262..dae4c594c170 100644
--- a/drivers/iio/accel/sca3000.c
+++ b/drivers/iio/accel/sca3000.c
@@ -1496,7 +1496,7 @@ static int sca3000_probe(struct spi_device *spi)
"sca3000",
indio_dev);
if (ret)
- return ret;
+ goto error_unconfigure_ring;
}
indio_dev->setup_ops = &sca3000_ring_setup_ops;
ret = sca3000_clean_setup(st);
@@ -1513,6 +1513,9 @@ static int sca3000_probe(struct spi_device *spi)
if (spi->irq)
free_irq(spi->irq, indio_dev);

+error_unconfigure_ring:
+ sca3000_unconfigure_ring(indio_dev);
+
return ret;
}

--
2.14.1