From 96e1dd7e81c25c77e8a508169f06f46825bc5cfc Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Sat, 22 Sep 2012 09:56:00 +0100 Subject: [PATCH] --- yaml --- r: 325491 b: refs/heads/master c: bea3e8a31f42269318378461ee2663b17957b165 h: refs/heads/master i: 325489: 4fef164b966f468a3d55e2fb3bd49cb60a6fc1f0 325487: 4f49860da7591448d7844598304414798c41dc4e v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/gyro/adis16260_core.c | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 6abe6db1f5ad..fbb035ca5d30 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3183bac16f537503eb3177773781d6d3059ad7b1 +refs/heads/master: bea3e8a31f42269318378461ee2663b17957b165 diff --git a/trunk/drivers/staging/iio/gyro/adis16260_core.c b/trunk/drivers/staging/iio/gyro/adis16260_core.c index 1d58d0e2b397..9571c03aa4cc 100644 --- a/trunk/drivers/staging/iio/gyro/adis16260_core.c +++ b/trunk/drivers/staging/iio/gyro/adis16260_core.c @@ -702,22 +702,16 @@ static int __devinit adis16260_probe(struct spi_device *spi) static int __devexit adis16260_remove(struct spi_device *spi) { - int ret; struct iio_dev *indio_dev = spi_get_drvdata(spi); iio_device_unregister(indio_dev); - - ret = adis16260_stop_device(indio_dev); - if (ret) - goto err_ret; - + adis16260_stop_device(indio_dev); adis16260_remove_trigger(indio_dev); iio_buffer_unregister(indio_dev); adis16260_unconfigure_ring(indio_dev); iio_device_free(indio_dev); -err_ret: - return ret; + return 0; } /*