X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=drivers%2Fstaging%2Fiio%2Fimu%2Fadis16400_core.c;h=c545cd9009fcefaea08124ce41f72dec86ab56ec;hb=1ffe2e7ac000b7a7c01b22cd64cc3d4ef01a9def;hp=a948472856ed4ad845605e4181646cc42483e86f;hpb=cd888a17f95fb170f6463990a6a24b4cd5fedea6;p=~andy%2Flinux

diff --git a/drivers/staging/iio/imu/adis16400_core.c b/drivers/staging/iio/imu/adis16400_core.c
index a948472856e..c545cd9009f 100644
--- a/drivers/staging/iio/imu/adis16400_core.c
+++ b/drivers/staging/iio/imu/adis16400_core.c
@@ -981,18 +981,10 @@ static int adis16400_probe(struct spi_device *spi)
 	if (ret)
 		goto error_free_dev;
 
-	ret = iio_buffer_register(indio_dev,
-				  st->variant->channels,
-				  st->variant->num_channels);
-	if (ret) {
-		dev_err(&spi->dev, "failed to initialize the ring\n");
-		goto error_unreg_ring_funcs;
-	}
-
 	if (spi->irq) {
 		ret = adis_probe_trigger(&st->adis, indio_dev);
 		if (ret)
-			goto error_uninitialize_ring;
+			goto error_unreg_ring_funcs;
 	}
 
 	/* Get the device into a sane initial state */
@@ -1008,8 +1000,6 @@ static int adis16400_probe(struct spi_device *spi)
 error_remove_trigger:
 	if (spi->irq)
 		adis_remove_trigger(&st->adis);
-error_uninitialize_ring:
-	iio_buffer_unregister(indio_dev);
 error_unreg_ring_funcs:
 	adis16400_unconfigure_ring(indio_dev);
 error_free_dev:
@@ -1029,7 +1019,6 @@ static int adis16400_remove(struct spi_device *spi)
 
 	if (spi->irq)
 		adis_remove_trigger(&st->adis);
-	iio_buffer_unregister(indio_dev);
 	adis16400_unconfigure_ring(indio_dev);
 
 	iio_device_free(indio_dev);