]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
iio: imu: inv_icm42600: Avoid configuring if already pm_runtime suspended
authorSean Nyekjaer <sean@geanix.com>
Mon, 20 Oct 2025 13:10:30 +0000 (09:10 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 29 Oct 2025 13:03:13 +0000 (14:03 +0100)
[ Upstream commit 466f7a2fef2a4e426f809f79845a1ec1aeb558f4 ]

Do as in suspend, skip resume configuration steps if the device is already
pm_runtime suspended. This avoids reconfiguring a device that is already
in the correct low-power state and ensures that pm_runtime handles the
power state transitions properly.

Fixes: 31c24c1e93c3 ("iio: imu: inv_icm42600: add core of new inv_icm42600 driver")
Signed-off-by: Sean Nyekjaer <sean@geanix.com>
Link: https://patch.msgid.link/20250901-icm42pmreg-v3-3-ef1336246960@geanix.com
Cc: <Stable@vger.kernel.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
[ Placed early return before regulator enable instead of APEX wakeup logic ]
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/iio/imu/inv_icm42600/inv_icm42600_core.c

index f955c3d01fef9dfecd125d158576b8cb94ed6d1a..cee9dee004a31c6618621f88c058fdb55d460738 100644 (file)
@@ -680,17 +680,15 @@ EXPORT_SYMBOL_GPL(inv_icm42600_core_probe);
 static int __maybe_unused inv_icm42600_suspend(struct device *dev)
 {
        struct inv_icm42600_state *st = dev_get_drvdata(dev);
-       int ret;
+       int ret = 0;
 
        mutex_lock(&st->lock);
 
        st->suspended.gyro = st->conf.gyro.mode;
        st->suspended.accel = st->conf.accel.mode;
        st->suspended.temp = st->conf.temp_en;
-       if (pm_runtime_suspended(dev)) {
-               ret = 0;
+       if (pm_runtime_suspended(dev))
                goto out_unlock;
-       }
 
        /* disable FIFO data streaming */
        if (st->fifo.on) {
@@ -722,10 +720,13 @@ static int __maybe_unused inv_icm42600_resume(struct device *dev)
        struct inv_icm42600_state *st = dev_get_drvdata(dev);
        struct inv_icm42600_timestamp *gyro_ts = iio_priv(st->indio_gyro);
        struct inv_icm42600_timestamp *accel_ts = iio_priv(st->indio_accel);
-       int ret;
+       int ret = 0;
 
        mutex_lock(&st->lock);
 
+       if (pm_runtime_suspended(dev))
+               goto out_unlock;
+
        ret = inv_icm42600_enable_regulator_vddio(st);
        if (ret)
                goto out_unlock;