From f06d4bb60b4344a7cc61ec1874f854b5e148fac2 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Sat, 22 Sep 2012 09:56:00 +0100 Subject: [PATCH] --- yaml --- r: 325495 b: refs/heads/master c: 4922fd697a573cfc519668b3013a7f8de97c4ae7 h: refs/heads/master i: 325493: 599f4c243a02deafe4dbb24d8c0c2ed329019ca1 325491: 96e1dd7e81c25c77e8a508169f06f46825bc5cfc 325487: 4f49860da7591448d7844598304414798c41dc4e v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/meter/ade7758_core.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 0b97321aa216..777ac67166be 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db314a1aaa2c0aa262f24e14c81b91b09e72e470 +refs/heads/master: 4922fd697a573cfc519668b3013a7f8de97c4ae7 diff --git a/trunk/drivers/staging/iio/meter/ade7758_core.c b/trunk/drivers/staging/iio/meter/ade7758_core.c index 958f8f235b42..a0fef77d8e5e 100644 --- a/trunk/drivers/staging/iio/meter/ade7758_core.c +++ b/trunk/drivers/staging/iio/meter/ade7758_core.c @@ -966,13 +966,9 @@ static int __devexit ade7758_remove(struct spi_device *spi) { struct iio_dev *indio_dev = spi_get_drvdata(spi); struct ade7758_state *st = iio_priv(indio_dev); - int ret; iio_device_unregister(indio_dev); - ret = ade7758_stop_device(&indio_dev->dev); - if (ret) - goto err_ret; - + ade7758_stop_device(&indio_dev->dev); ade7758_remove_trigger(indio_dev); ade7758_uninitialize_ring(indio_dev); ade7758_unconfigure_ring(indio_dev); @@ -981,8 +977,7 @@ static int __devexit ade7758_remove(struct spi_device *spi) iio_device_free(indio_dev); -err_ret: - return ret; + return 0; } static const struct spi_device_id ade7758_id[] = {