Merge branch ‘pm-cpufreq-fixes’ [Linux 5.0]

Merge branch ‘pm-cpufreq-fixes’ [Linux 5.0]

This Linux kernel change "Merge branch ‘pm-cpufreq-fixes’" is included in the Linux 5.0 release. This change is authored by Rafael J. Wysocki <rafael.j.wysocki [at] intel.com> on Fri Feb 22 10:17:11 2019 +0100. The commit for this change in Linux stable tree is 5b317cb (patch). Other info about this change: Merge: 74fb448 8cbd468

Merge branch 'pm-cpufreq-fixes'

* pm-cpufreq-fixes:
  cpufreq: scmi: Fix use-after-free in scmi_cpufreq_exit()

There is no are 0 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 drivers/base/power/runtime.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
index 0ea2139..ccd296d 100644
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -95,7 +95,7 @@ static void __update_runtime_status(struct device *dev, enum rpm_status status)
 static void pm_runtime_deactivate_timer(struct device *dev)
 {
    if (dev->power.timer_expires > 0) {
-       hrtimer_cancel(&dev->power.suspend_timer);
+       hrtimer_try_to_cancel(&dev->power.suspend_timer);
        dev->power.timer_expires = 0;
    }
 }

Leave a Reply

Your email address will not be published. Required fields are marked *