提交 0b4ac3dc 编写于 作者: L Lars-Peter Clausen 提交者: Jonathan Cameron

staging:iio:adis16400: 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: NLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: NJonathan Cameron <jic23@kernel.org>
上级 bea3e8a3
...@@ -1208,13 +1208,10 @@ static int __devinit adis16400_probe(struct spi_device *spi) ...@@ -1208,13 +1208,10 @@ static int __devinit adis16400_probe(struct spi_device *spi)
/* fixme, confirm ordering in this function */ /* fixme, confirm ordering in this function */
static int __devexit adis16400_remove(struct spi_device *spi) static int __devexit adis16400_remove(struct spi_device *spi)
{ {
int ret;
struct iio_dev *indio_dev = spi_get_drvdata(spi); struct iio_dev *indio_dev = spi_get_drvdata(spi);
iio_device_unregister(indio_dev); iio_device_unregister(indio_dev);
ret = adis16400_stop_device(indio_dev); adis16400_stop_device(indio_dev);
if (ret)
goto err_ret;
adis16400_remove_trigger(indio_dev); adis16400_remove_trigger(indio_dev);
iio_buffer_unregister(indio_dev); iio_buffer_unregister(indio_dev);
...@@ -1222,9 +1219,6 @@ static int __devexit adis16400_remove(struct spi_device *spi) ...@@ -1222,9 +1219,6 @@ static int __devexit adis16400_remove(struct spi_device *spi)
iio_device_free(indio_dev); iio_device_free(indio_dev);
return 0; return 0;
err_ret:
return ret;
} }
static const struct spi_device_id adis16400_id[] = { static const struct spi_device_id adis16400_id[] = {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册