1 files changed, 6 insertions, 9 deletions

diff --git a/drivers/staging/iio/gyro/adis16260_core.c b/drivers/staging/iio/gyro/adis16260_core.c
index acd17e50df5..73157b21252 100644
--- a/drivers/staging/iio/gyro/adis16260_core.c
+++ b/drivers/staging/iio/gyro/adis16260_core.c
@@ -577,7 +577,7 @@ static const struct iio_info adis16260_info = {
 
 static int __devinit adis16260_probe(struct spi_device *spi)
 {
-        int ret, regdone = 0;
+        int ret;
         struct adis16260_platform_data *pd = spi->dev.platform_data;
         struct adis16260_state *st;
         struct iio_dev *indio_dev;
@@ -625,10 +625,6 @@ static int __devinit adis16260_probe(struct spi_device *spi)
         if (ret)
                 goto error_free_dev;
 
-        ret = iio_device_register(indio_dev);
-        if (ret)
-                goto error_unreg_ring_funcs;
-        regdone = 1;
         ret = iio_ring_buffer_register(indio_dev,
                                        indio_dev->channels,
                                        ARRAY_SIZE(adis16260_channels_x));
@@ -654,6 +650,10 @@ static int __devinit adis16260_probe(struct spi_device *spi)
         ret = adis16260_initial_setup(indio_dev);
         if (ret)
                 goto error_remove_trigger;
+        ret = iio_device_register(indio_dev);
+        if (ret)
+                goto error_remove_trigger;
+
         return 0;
 
 error_remove_trigger:
@@ -663,10 +663,7 @@ error_uninitialize_ring:
 error_unreg_ring_funcs:
         adis16260_unconfigure_ring(indio_dev);
 error_free_dev:
-        if (regdone)
-                iio_device_unregister(indio_dev);
-        else
-                iio_free_device(indio_dev);
+        iio_free_device(indio_dev);
 error_ret:
         return ret;
 }