瀏覽代碼

staging:iio:ade7758: 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 <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Lars-Peter Clausen 13 年之前
父節點
當前提交
4922fd697a
共有 1 個文件被更改,包括 2 次插入7 次删除
  1. 2 7
      drivers/staging/iio/meter/ade7758_core.c

+ 2 - 7
drivers/staging/iio/meter/ade7758_core.c

@@ -966,13 +966,9 @@ static int __devexit ade7758_remove(struct spi_device *spi)
 {
 {
 	struct iio_dev *indio_dev = spi_get_drvdata(spi);
 	struct iio_dev *indio_dev = spi_get_drvdata(spi);
 	struct ade7758_state *st = iio_priv(indio_dev);
 	struct ade7758_state *st = iio_priv(indio_dev);
-	int ret;
 
 
 	iio_device_unregister(indio_dev);
 	iio_device_unregister(indio_dev);
-	ret = ade7758_stop_device(&indio_dev->dev);
-	if (ret)
-		goto err_ret;
-
+	ade7758_stop_device(&indio_dev->dev);
 	ade7758_remove_trigger(indio_dev);
 	ade7758_remove_trigger(indio_dev);
 	ade7758_uninitialize_ring(indio_dev);
 	ade7758_uninitialize_ring(indio_dev);
 	ade7758_unconfigure_ring(indio_dev);
 	ade7758_unconfigure_ring(indio_dev);
@@ -981,8 +977,7 @@ static int __devexit ade7758_remove(struct spi_device *spi)
 
 
 	iio_device_free(indio_dev);
 	iio_device_free(indio_dev);
 
 
-err_ret:
-	return ret;
+	return 0;
 }
 }
 
 
 static const struct spi_device_id ade7758_id[] = {
 static const struct spi_device_id ade7758_id[] = {