From ad78a2082082e1d24e9954d08379c74b59596714 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Sat, 22 Sep 2012 09:56:00 +0100 Subject: [PATCH] --- yaml --- r: 325492 b: refs/heads/master c: 0b4ac3dce4093f426322be0eec0e38127a62bb7f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/imu/adis16400_core.c | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index fbb035ca5d30..6ba350617100 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bea3e8a31f42269318378461ee2663b17957b165 +refs/heads/master: 0b4ac3dce4093f426322be0eec0e38127a62bb7f diff --git a/trunk/drivers/staging/iio/imu/adis16400_core.c b/trunk/drivers/staging/iio/imu/adis16400_core.c index b8c280cb8865..b302c9ba2712 100644 --- a/trunk/drivers/staging/iio/imu/adis16400_core.c +++ b/trunk/drivers/staging/iio/imu/adis16400_core.c @@ -1208,13 +1208,10 @@ static int __devinit adis16400_probe(struct spi_device *spi) /* fixme, confirm ordering in this function */ static int __devexit adis16400_remove(struct spi_device *spi) { - int ret; struct iio_dev *indio_dev = spi_get_drvdata(spi); iio_device_unregister(indio_dev); - ret = adis16400_stop_device(indio_dev); - if (ret) - goto err_ret; + adis16400_stop_device(indio_dev); adis16400_remove_trigger(indio_dev); iio_buffer_unregister(indio_dev); @@ -1222,9 +1219,6 @@ static int __devexit adis16400_remove(struct spi_device *spi) iio_device_free(indio_dev); return 0; - -err_ret: - return ret; } static const struct spi_device_id adis16400_id[] = {