summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2019-08-29 16:48:15 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2019-09-02 22:38:00 +0200
commit3ea4ca9267cf5d02149f7d8a11d8b4c82723a668 (patch)
tree8db7e502e8bf8f18520ca19aa951ba81814ac2bb
parentPM / Domains: Simplify genpd_lookup_dev() (diff)
downloadlinux-3ea4ca9267cf5d02149f7d8a11d8b4c82723a668.tar.xz
linux-3ea4ca9267cf5d02149f7d8a11d8b4c82723a668.zip
PM / Domains: Verify PM domain type in dev_pm_genpd_set_performance_state()
The dev_pm_genpd_set_performance_state() could in principle be called for a device that has a different PM domain type attached than a genpd. This would lead to a problem as dev_to_genpd() uses the container_of macro. Address this problem by using dev_to_genpd_safe() instead. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--drivers/base/power/domain.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index 59d6f183d0bb..cc85e87eaf05 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -380,8 +380,8 @@ int dev_pm_genpd_set_performance_state(struct device *dev, unsigned int state)
unsigned int prev;
int ret;
- genpd = dev_to_genpd(dev);
- if (IS_ERR(genpd))
+ genpd = dev_to_genpd_safe(dev);
+ if (!genpd)
return -ENODEV;
if (unlikely(!genpd->set_performance_state))