---

yaml --- r: 325496 b: refs/heads/master c: e854bcc h: refs/heads/master v: v3
git-mirror · Sep 22, 2012 · 3a669ec · 3a669ec
1 parent f06d4bb
commit 3a669ec
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4922fd697a573cfc519668b3013a7f8de97c4ae7
+refs/heads/master: e854bcc938e734e2f556bc7ada9552669b8f58b0
diff --git a/trunk/drivers/staging/iio/meter/ade7759.c b/trunk/drivers/staging/iio/meter/ade7759.c
@@ -501,18 +501,13 @@ static int __devinit ade7759_probe(struct spi_device *spi)
 /* fixme, confirm ordering in this function */
 static int __devexit ade7759_remove(struct spi_device *spi)
 {
-	int ret;
 	struct iio_dev *indio_dev = spi_get_drvdata(spi);
 
 	iio_device_unregister(indio_dev);
-	ret = ade7759_stop_device(&(indio_dev->dev));
-	if (ret)
-		goto err_ret;
-
+	ade7759_stop_device(&indio_dev->dev);
 	iio_device_free(indio_dev);
 
-err_ret:
-	return ret;
+	return 0;
 }
 
 static struct spi_driver ade7759_driver = {