iio: Fix error handling for PM
authorMiaoqian Lin <linmq006@gmail.com>
Thu, 6 Jan 2022 11:23:09 +0000 (11:23 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 2 Mar 2022 10:42:53 +0000 (11:42 +0100)
commit 632fe0bb8c5b9c06ec961f575ee42a6fff5eceeb upstream.

The pm_runtime_enable will increase power disable depth.
If the probe fails, we should use pm_runtime_disable() to balance
pm_runtime_enable(). In the PM Runtime docs:
    Drivers in ->remove() callback should undo the runtime PM changes done
    in ->probe(). Usually this means calling pm_runtime_disable(),
    pm_runtime_dont_use_autosuspend() etc.
We should do this in error handling.

Fix this problem for the following drivers: bmc150, bmg160, kmx61,
kxcj-1013, mma9551, mma9553.

Fixes: 7d0ead5c3f00 ("iio: Reconcile operation order between iio_register/unregister and pm functions")
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20220106112309.16879-1-linmq006@gmail.com
Cc: <Stable@vger.kernel.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/iio/accel/bmc150-accel-core.c
drivers/iio/accel/kxcjk-1013.c
drivers/iio/accel/mma9551.c
drivers/iio/accel/mma9553.c
drivers/iio/gyro/bmg160_core.c
drivers/iio/imu/kmx61.c
drivers/iio/magnetometer/bmc150_magn.c

index 48435865fdaf34387b563b9ce025e00fddedcc0b..792526462f1c9c4275edda27526cc7eb555e97a0 100644 (file)
@@ -1648,11 +1648,14 @@ int bmc150_accel_core_probe(struct device *dev, struct regmap *regmap, int irq,
        ret = iio_device_register(indio_dev);
        if (ret < 0) {
                dev_err(dev, "Unable to register iio device\n");
-               goto err_trigger_unregister;
+               goto err_pm_cleanup;
        }
 
        return 0;
 
+err_pm_cleanup:
+       pm_runtime_dont_use_autosuspend(dev);
+       pm_runtime_disable(dev);
 err_trigger_unregister:
        bmc150_accel_unregister_triggers(data, BMC150_ACCEL_TRIGGERS - 1);
 err_buffer_cleanup:
index 2eaf85b6e39f4c399ea971451649042fd82c6712..89e0a89d95d6bdadc34dcda832345ae95e4c89d8 100644 (file)
@@ -1429,11 +1429,14 @@ static int kxcjk1013_probe(struct i2c_client *client,
        ret = iio_device_register(indio_dev);
        if (ret < 0) {
                dev_err(&client->dev, "unable to register iio device\n");
-               goto err_buffer_cleanup;
+               goto err_pm_cleanup;
        }
 
        return 0;
 
+err_pm_cleanup:
+       pm_runtime_dont_use_autosuspend(&client->dev);
+       pm_runtime_disable(&client->dev);
 err_buffer_cleanup:
        iio_triggered_buffer_cleanup(indio_dev);
 err_trigger_unregister:
index 08a2303cc9df3c08022bb32730faa41c01f49816..26421e8e8263958b1585d0b8d176a56bca0c4951 100644 (file)
@@ -495,11 +495,14 @@ static int mma9551_probe(struct i2c_client *client,
        ret = iio_device_register(indio_dev);
        if (ret < 0) {
                dev_err(&client->dev, "unable to register iio device\n");
-               goto out_poweroff;
+               goto err_pm_cleanup;
        }
 
        return 0;
 
+err_pm_cleanup:
+       pm_runtime_dont_use_autosuspend(&client->dev);
+       pm_runtime_disable(&client->dev);
 out_poweroff:
        mma9551_set_device_state(client, false);
 
index c15908faa38167b0d6ff68d53ceca8de0ed2d403..a23a7685d1f93c893da306c14760eeea03966e94 100644 (file)
@@ -1134,12 +1134,15 @@ static int mma9553_probe(struct i2c_client *client,
        ret = iio_device_register(indio_dev);
        if (ret < 0) {
                dev_err(&client->dev, "unable to register iio device\n");
-               goto out_poweroff;
+               goto err_pm_cleanup;
        }
 
        dev_dbg(&indio_dev->dev, "Registered device %s\n", name);
        return 0;
 
+err_pm_cleanup:
+       pm_runtime_dont_use_autosuspend(&client->dev);
+       pm_runtime_disable(&client->dev);
 out_poweroff:
        mma9551_set_device_state(client, false);
        return ret;
index 39fe0b1785920c5150005a7af38a702087cdc564..b6b90eebec0b99b290490ae5b7f46c713f06fac9 100644 (file)
@@ -1170,11 +1170,14 @@ int bmg160_core_probe(struct device *dev, struct regmap *regmap, int irq,
        ret = iio_device_register(indio_dev);
        if (ret < 0) {
                dev_err(dev, "unable to register iio device\n");
-               goto err_buffer_cleanup;
+               goto err_pm_cleanup;
        }
 
        return 0;
 
+err_pm_cleanup:
+       pm_runtime_dont_use_autosuspend(dev);
+       pm_runtime_disable(dev);
 err_buffer_cleanup:
        iio_triggered_buffer_cleanup(indio_dev);
 err_trigger_unregister:
index 61885e99d3fc14db2655e7ac955b1adb4dd7a618..89133315e6aaf07bf509916a857233e04275acc9 100644 (file)
@@ -1392,7 +1392,7 @@ static int kmx61_probe(struct i2c_client *client,
        ret = iio_device_register(data->acc_indio_dev);
        if (ret < 0) {
                dev_err(&client->dev, "Failed to register acc iio device\n");
-               goto err_buffer_cleanup_mag;
+               goto err_pm_cleanup;
        }
 
        ret = iio_device_register(data->mag_indio_dev);
@@ -1405,6 +1405,9 @@ static int kmx61_probe(struct i2c_client *client,
 
 err_iio_unregister_acc:
        iio_device_unregister(data->acc_indio_dev);
+err_pm_cleanup:
+       pm_runtime_dont_use_autosuspend(&client->dev);
+       pm_runtime_disable(&client->dev);
 err_buffer_cleanup_mag:
        if (client->irq > 0)
                iio_triggered_buffer_cleanup(data->mag_indio_dev);
index 8eacfaf584cfd0690fb4020a6ff74cca8bb490eb..620537d0104d4b756fcaa17f8e1c93bb390ca444 100644 (file)
@@ -941,13 +941,14 @@ int bmc150_magn_probe(struct device *dev, struct regmap *regmap,
        ret = iio_device_register(indio_dev);
        if (ret < 0) {
                dev_err(dev, "unable to register iio device\n");
-               goto err_disable_runtime_pm;
+               goto err_pm_cleanup;
        }
 
        dev_dbg(dev, "Registered device %s\n", name);
        return 0;
 
-err_disable_runtime_pm:
+err_pm_cleanup:
+       pm_runtime_dont_use_autosuspend(dev);
        pm_runtime_disable(dev);
 err_buffer_cleanup:
        iio_triggered_buffer_cleanup(indio_dev);