1 files changed, 6 insertions, 10 deletions

diff --git a/drivers/staging/iio/accel/adis16204_core.c b/drivers/staging/iio/accel/adis16204_core.c
index 42a37bb0136..e0b87840133 100644
--- a/drivers/staging/iio/accel/adis16204_core.c
+++ b/drivers/staging/iio/accel/adis16204_core.c
@@ -494,7 +494,7 @@ static const struct iio_info adis16204_info = {
 
 static int __devinit adis16204_probe(struct spi_device *spi)
 {
-        int ret, regdone = 0;
+        int ret;
         struct adis16204_state *st;
         struct iio_dev *indio_dev;
 
@@ -521,11 +521,6 @@ static int __devinit adis16204_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,
                                        adis16204_channels,
                                        ARRAY_SIZE(adis16204_channels));
@@ -544,6 +539,10 @@ static int __devinit adis16204_probe(struct spi_device *spi)
         ret = adis16204_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:
@@ -553,10 +552,7 @@ error_uninitialize_ring:
 error_unreg_ring_funcs:
         adis16204_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;
 }