Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78aa904a authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'pm-core' and 'pm-misc' 

* pm-core:
  PM / runtime: Document new pm_runtime_set_suspended() constraint

* pm-misc:
  thunderbolt: icm: Ignore mailbox errors in icm_suspend()
parents 8a05c311 c3bf5bb5 a684c5b1

Documentation/power/runtime_pm.txt

+2 −1
Original line number Diff line number Diff line
@@ -435,7 +435,8 @@ drivers/base/power/runtime.c and include/linux/pm_runtime.h: 
      PM status to 'suspended' and update its parent's counter of 'active'

      children as appropriate (it is only valid to use this function if

      'power.runtime_error' is set or 'power.disable_depth' is greater than

      zero)

      zero); it will fail and return an error code if the device has a child

      which is active and the 'power.ignore_children' flag is unset



  bool pm_runtime_active(struct device *dev);

    - return true if the device's runtime PM status is 'active' or its

drivers/thunderbolt/icm.c

+8 −1
Original line number Diff line number Diff line
@@ -904,7 +904,14 @@ static int icm_driver_ready(struct tb *tb) 


static int icm_suspend(struct tb *tb)

{

	return nhi_mailbox_cmd(tb->nhi, NHI_MAILBOX_SAVE_DEVS, 0);

	int ret;



	ret = nhi_mailbox_cmd(tb->nhi, NHI_MAILBOX_SAVE_DEVS, 0);

	if (ret)

		tb_info(tb, "Ignoring mailbox command error (%d) in %s\n",

			ret, __func__);



	return 0;

}



/*