---

yaml --- r: 325492 b: refs/heads/master c: 0b4ac3d h: refs/heads/master v: v3
git-mirror · Sep 22, 2012 · ad78a20 · ad78a20
1 parent 96e1dd7
commit ad78a20
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git 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
@@ -1208,23 +1208,17 @@ 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);
 	adis16400_unconfigure_ring(indio_dev);
 	iio_device_free(indio_dev);
 
 	return 0;
-
-err_ret:
-	return ret;
 }
 
 static const struct spi_device_id adis16400_id[] = {