Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1509714

[PATCH v3] PM / devfreq: Restart previous governor if new governor fails to start

Show all headers | View raw

If the new governor fails to start, switch back to old governor so that the
devfreq state is not left in some weird limbo.

Signed-off-by: Saravana Kannan <skannan@codeaurora.org>
---
* Fix NULL deref for real this time.
* Addressed some style preferences.

 drivers/devfreq/devfreq.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
index bf3ea76..77c41a5 100644
--- a/drivers/devfreq/devfreq.c
+++ b/drivers/devfreq/devfreq.c
@@ -919,7 +919,7 @@ static ssize_t governor_store(struct device *dev, struct device_attribute *attr,
 	struct devfreq *df = to_devfreq(dev);
 	int ret;
 	char str_governor[DEVFREQ_NAME_LEN + 1];
-	struct devfreq_governor *governor;
+	const struct devfreq_governor *governor, *prev_governor;
 
 	ret = sscanf(buf, "%" __stringify(DEVFREQ_NAME_LEN) "s", str_governor);
 	if (ret != 1)
@@ -944,12 +944,21 @@ static ssize_t governor_store(struct device *dev, struct device_attribute *attr,
 			goto out;
 		}
 	}
+	prev_governor = df->governor;
 	df->governor = governor;
 	strncpy(df->governor_name, governor->name, DEVFREQ_NAME_LEN);
 	ret = df->governor->event_handler(df, DEVFREQ_GOV_START, NULL);
-	if (ret)
+	if (ret) {
 		dev_warn(dev, "%s: Governor %s not started(%d)\n",
 			 __func__, df->governor->name, ret);
+		if (prev_governor) {
+			df->governor = prev_governor;
+			strncpy(df->governor_name, prev_governor->name,
+				DEVFREQ_NAME_LEN);
+			df->governor->event_handler(df, DEVFREQ_GOV_START,
+						    NULL);
+		}
+	}
 out:
 	mutex_unlock(&devfreq_list_lock);
 
-- 
Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH v3] PM / devfreq: Restart previous governor if new governor fails to start Saravana Kannan <skannan@codeaurora.org> - 2016-10-26 21:20 +0200
  Re: [PATCH v3] PM / devfreq: Restart previous governor if new governor  fails to start Chanwoo Choi <cw00.choi@samsung.com> - 2016-10-27 02:10 +0200
    Re: [PATCH v3] PM / devfreq: Restart previous governor if new governor  fails to start Saravana Kannan <skannan@codeaurora.org> - 2016-11-07 20:10 +0100
      Re: [PATCH v3] PM / devfreq: Restart previous governor if new governor  fails to start Chanwoo Choi <cw00.choi@samsung.com> - 2016-11-08 10:10 +0100
        Re: [PATCH v3] PM / devfreq: Restart previous governor if new governor  fails to start Saravana Kannan <skannan@codeaurora.org> - 2016-11-08 22:00 +0100
          Re: [PATCH v3] PM / devfreq: Restart previous governor if new governor  fails to start Chanwoo Choi <cw00.choi@samsung.com> - 2016-11-09 02:40 +0100
            Re: [PATCH v3] PM / devfreq: Restart previous governor if new governor  fails to start Chanwoo Choi <cw00.choi@samsung.com> - 2016-11-09 03:40 +0100
              Re: [PATCH v3] PM / devfreq: Restart previous governor if new governor  fails to start Chanwoo Choi <cw00.choi@samsung.com> - 2016-11-09 03:40 +0100
                Re: [PATCH v3] PM / devfreq: Restart previous governor if new governor  fails to start Saravana Kannan <skannan@codeaurora.org> - 2016-11-09 21:40 +0100
                Re: [PATCH v3] PM / devfreq: Restart previous governor if new governor  fails to start Chanwoo Choi <cw00.choi@samsung.com> - 2016-11-10 01:20 +0100

csiph-web