From d576c7558616e3c096fca1f21531e1e50d2f27ca Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Sat, 22 Sep 2012 09:56:00 +0100 Subject: [PATCH] staging:iio:ade7753: Do not return a error in remove function In the Linux device driver model the remove callback is not allowed to fail and the device will be removed regardless of the return value of the remove callback. So if we abort in the remove function and do not free all resources we will create a resource leak. Also all kinds of undefined behaviour are expected to happen since the IIO device is still there while its parent is already gone. The error which the driver tries to handle in the remove function is non-critical, so we can just ignore it and continue to free all resources and remove the IIO device. Signed-off-by: Lars-Peter Clausen Signed-off-by: Jonathan Cameron --- drivers/staging/iio/meter/ade7753.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/staging/iio/meter/ade7753.c b/drivers/staging/iio/meter/ade7753.c index 380c05e7f7f..8b9eceb66b3 100644 --- a/drivers/staging/iio/meter/ade7753.c +++ b/drivers/staging/iio/meter/ade7753.c @@ -557,18 +557,13 @@ error_ret: /* fixme, confirm ordering in this function */ static int __devexit ade7753_remove(struct spi_device *spi) { - int ret; struct iio_dev *indio_dev = spi_get_drvdata(spi); iio_device_unregister(indio_dev); - - ret = ade7753_stop_device(&(indio_dev->dev)); - if (ret) - goto err_ret; - + ade7753_stop_device(&indio_dev->dev); iio_device_free(indio_dev); -err_ret: - return ret; + + return 0; } static struct spi_driver ade7753_driver = { -- 2.46.0