iio: gyro: mpu3050: Move iio_device_register() to correct location

iio_device_register() should be at the end of the probe function to
prevent race conditions.

Place iio_device_register() at the end of the probe function and place
iio_device_unregister() accordingly.

Fixes: 3904b28efb2c7 ("iio: gyro: Add driver for the MPU-3050 gyroscope")
Suggested-by: Jonathan Cameron <jic23@kernel.org>
Reviewed-by: Linus Walleij <linusw@kernel.org>
Signed-off-by: Ethan Tidmore <ethantidmore06@gmail.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com>
Cc: <Stable@vger.kernel.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/gyro/mpu3050-core.c b/drivers/iio/gyro/mpu3050-core.c
index d2f0899ac46b81de0cac6d2c17a35a9fdd6589da..2e92daf047bd413c66fbf4ce08c8f1e21f2dc9df 100644 (file)
--- a/drivers/iio/gyro/mpu3050-core.c
+++ b/drivers/iio/gyro/mpu3050-core.c
@@ -1226,12 +1226,6 @@ int mpu3050_common_probe(struct device *dev,
                goto err_power_down;
        }
 
-       ret = iio_device_register(indio_dev);
-       if (ret) {
-               dev_err(dev, "device register failed\n");
-               goto err_cleanup_buffer;
-       }
-
        dev_set_drvdata(dev, indio_dev);
 
        /* Check if we have an assigned IRQ to use as trigger */
@@ -1254,9 +1248,20 @@ int mpu3050_common_probe(struct device *dev,
        pm_runtime_use_autosuspend(dev);
        pm_runtime_put(dev);
 
+       ret = iio_device_register(indio_dev);
+       if (ret) {
+               dev_err(dev, "device register failed\n");
+               goto err_iio_device_register;
+       }
+
        return 0;
 
-err_cleanup_buffer:
+err_iio_device_register:
+       pm_runtime_get_sync(dev);
+       pm_runtime_put_noidle(dev);
+       pm_runtime_disable(dev);
+       if (irq)
+               free_irq(mpu3050->irq, mpu3050->trig);
        iio_triggered_buffer_cleanup(indio_dev);
 err_power_down:
        mpu3050_power_down(mpu3050);
@@ -1269,13 +1274,13 @@ void mpu3050_common_remove(struct device *dev)
        struct iio_dev *indio_dev = dev_get_drvdata(dev);
        struct mpu3050 *mpu3050 = iio_priv(indio_dev);
 
+       iio_device_unregister(indio_dev);
        pm_runtime_get_sync(dev);
        pm_runtime_put_noidle(dev);
        pm_runtime_disable(dev);
        iio_triggered_buffer_cleanup(indio_dev);
        if (mpu3050->irq)
                free_irq(mpu3050->irq, mpu3050->trig);
-       iio_device_unregister(indio_dev);
        mpu3050_power_down(mpu3050);
 }