]> www.infradead.org Git - linux.git/commitdiff
Merge branch 'pm-powercap'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 25 Oct 2024 15:27:19 +0000 (17:27 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 25 Oct 2024 15:27:19 +0000 (17:27 +0200)
Merge a dtpm_devfreq power capping driver fix for 6.12-rc5:

 - Fix a dev_pm_qos_add_request() return value check in
   __dtpm_devfreq_setup() to prevent it from failing if
   a positive number is returned (Yuan Can).

* pm-powercap:
  powercap: dtpm_devfreq: Fix error check against dev_pm_qos_add_request()


Trivial merge