From: Lars-Peter Clausen Date: Sat, 22 Sep 2012 08:56:00 +0000 (+0100) Subject: staging:iio:ade7759: Do not return a error in remove function X-Git-Tag: v3.7-rc1~173^2~50^2~9 X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=e854bcc938e734e2f556bc7ada9552669b8f58b0;p=~andy%2Flinux staging:iio:ade7759: 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 --- diff --git a/drivers/staging/iio/meter/ade7759.c b/drivers/staging/iio/meter/ade7759.c index 435e35bd9c8..cb0707cbc34 100644 --- a/drivers/staging/iio/meter/ade7759.c +++ b/drivers/staging/iio/meter/ade7759.c @@ -501,18 +501,13 @@ error_ret: /* fixme, confirm ordering in this function */ static int __devexit ade7759_remove(struct spi_device *spi) { - int ret; struct iio_dev *indio_dev = spi_get_drvdata(spi); iio_device_unregister(indio_dev); - ret = ade7759_stop_device(&(indio_dev->dev)); - if (ret) - goto err_ret; - + ade7759_stop_device(&indio_dev->dev); iio_device_free(indio_dev); -err_ret: - return ret; + return 0; } static struct spi_driver ade7759_driver = {