summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2018-08-01 13:50:32 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2018-08-01 13:50:32 -0400
commit325e75f1ef2f384e6922c2267659886e27e8bc6c (patch)
treea01eb22557e60dd432ccd193e85e33caf8d73c3d
parentd69481a24940def3a0deaaeb6d71ade17520a29e (diff)
downloadlongterm-queue-4.12-325e75f1ef2f384e6922c2267659886e27e8bc6c.tar.gz
pm: refresh for old opp path spec
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--queue/PM-OPP-Move-error-message-to-debug-level.patch13
1 files changed, 7 insertions, 6 deletions
diff --git a/queue/PM-OPP-Move-error-message-to-debug-level.patch b/queue/PM-OPP-Move-error-message-to-debug-level.patch
index ba463e3..15f3de0 100644
--- a/queue/PM-OPP-Move-error-message-to-debug-level.patch
+++ b/queue/PM-OPP-Move-error-message-to-debug-level.patch
@@ -1,4 +1,4 @@
-From 035ed07208dc501d023873447113f3f178592156 Mon Sep 17 00:00:00 2001
+From 1e527c76785c65e04ec93e50b16e651cce060f3c Mon Sep 17 00:00:00 2001
From: Fabio Estevam <fabio.estevam@nxp.com>
Date: Fri, 29 Sep 2017 14:39:49 -0300
Subject: [PATCH] PM / OPP: Move error message to debug level
@@ -24,12 +24,13 @@ return value and decide if it will print an error or not.
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-diff --git a/drivers/opp/core.c b/drivers/opp/core.c
-index a6de32530693..0459b1204694 100644
---- a/drivers/opp/core.c
-+++ b/drivers/opp/core.c
-@@ -296,7 +296,7 @@ int dev_pm_opp_get_opp_count(struct device *dev)
+diff --git a/drivers/base/power/opp/core.c b/drivers/base/power/opp/core.c
+index c18b285f7ca1..66719851927a 100644
+--- a/drivers/base/power/opp/core.c
++++ b/drivers/base/power/opp/core.c
+@@ -304,7 +304,7 @@ int dev_pm_opp_get_opp_count(struct device *dev)
opp_table = _find_opp_table(dev);
if (IS_ERR(opp_table)) {
count = PTR_ERR(opp_table);