summaryrefslogtreecommitdiffstats
path: root/drivers/devfreq
diff options
context:
space:
mode:
authorLeonard Crestez <leonard.crestez@nxp.com>2019-09-24 10:26:53 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-01-09 10:20:01 +0100
commit89dda19e77ce019582ce1d7f19396de6ad846091 (patch)
tree6118c7a854c6474d115a7a365caf6e5e2d9d1e0e /drivers/devfreq
parentfe8adb0aae33905bdd6b682907d8c48b1857ec99 (diff)
downloadlinux-stable-89dda19e77ce019582ce1d7f19396de6ad846091.tar.gz
linux-stable-89dda19e77ce019582ce1d7f19396de6ad846091.tar.bz2
linux-stable-89dda19e77ce019582ce1d7f19396de6ad846091.zip
PM / devfreq: Check NULL governor in available_governors_show
commit d68adc8f85cd757bd33c8d7b2660ad6f16f7f3dc upstream. The governor is initialized after sysfs attributes become visible so in theory the governor field can be NULL here. Fixes: bcf23c79c4e46 ("PM / devfreq: Fix available_governor sysfs") Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com> Reviewed-by: Matthias Kaehlcke <mka@chromium.org> Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/devfreq')
-rw-r--r--drivers/devfreq/devfreq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
index ffd2d6b44dfb..c64d20fdc187 100644
--- a/drivers/devfreq/devfreq.c
+++ b/drivers/devfreq/devfreq.c
@@ -1196,7 +1196,7 @@ static ssize_t available_governors_show(struct device *d,
* The devfreq with immutable governor (e.g., passive) shows
* only own governor.
*/
- if (df->governor->immutable) {
+ if (df->governor && df->governor->immutable) {
count = scnprintf(&buf[count], DEVFREQ_NAME_LEN,
"%s ", df->governor_name);
/*