1 files changed, 9 insertions, 3 deletions

diff --git a/drivers/iio/common/hid-sensors/hid-sensor-trigger.c b/drivers/iio/common/hid-sensors/hid-sensor-trigger.c
index 55dfd6288d18..cfb6588565ba 100644
--- a/drivers/iio/common/hid-sensors/hid-sensor-trigger.c
+++ b/drivers/iio/common/hid-sensors/hid-sensor-trigger.c
@@ -179,6 +179,10 @@ int hid_sensor_power_state(struct hid_sensor_common *st, bool state)
         int ret;
 
         atomic_set(&st->user_requested_state, state);
+
+        if (atomic_add_unless(&st->runtime_pm_enable, 1, 1))
+                pm_runtime_enable(&st->pdev->dev);
+
         if (state)
                 ret = pm_runtime_get_sync(&st->pdev->dev);
         else {
@@ -221,7 +225,8 @@ static void hid_sensor_set_power_work(struct work_struct *work)
         if (attrb->latency_ms > 0)
                 hid_sensor_set_report_latency(attrb, attrb->latency_ms);
 
-        _hid_sensor_power_state(attrb, true);
+        if (atomic_read(&attrb->user_requested_state))
+                _hid_sensor_power_state(attrb, true);
 }
 
 static int hid_sensor_data_rdy_trigger_set_state(struct iio_trigger *trig,
@@ -232,7 +237,9 @@ static int hid_sensor_data_rdy_trigger_set_state(struct iio_trigger *trig,
 
 void hid_sensor_remove_trigger(struct hid_sensor_common *attrb)
 {
-        pm_runtime_disable(&attrb->pdev->dev);
+        if (atomic_read(&attrb->runtime_pm_enable))
+                pm_runtime_disable(&attrb->pdev->dev);
+
         pm_runtime_set_suspended(&attrb->pdev->dev);
         pm_runtime_put_noidle(&attrb->pdev->dev);
 
@@ -282,7 +289,6 @@ int hid_sensor_setup_trigger(struct iio_dev *indio_dev, const char *name,
         INIT_WORK(&attrb->work, hid_sensor_set_power_work);
 
         pm_suspend_ignore_children(&attrb->pdev->dev, true);
-        pm_runtime_enable(&attrb->pdev->dev);
         /* Default to 3 seconds, but can be changed from sysfs */
         pm_runtime_set_autosuspend_delay(&attrb->pdev->dev,
                                          3000);