diff options
author | Ulf Hansson <ulf.hansson@linaro.org> | 2019-08-29 10:48:15 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-09-02 16:38:00 -0400 |
commit | 3ea4ca9267cf5d02149f7d8a11d8b4c82723a668 (patch) | |
tree | 8db7e502e8bf8f18520ca19aa951ba81814ac2bb | |
parent | b3ad17c09899d491cf9815a6db44d3f9b3f244e7 (diff) |
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.c | 4 |
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) | |||
380 | unsigned int prev; | 380 | unsigned int prev; |
381 | int ret; | 381 | int ret; |
382 | 382 | ||
383 | genpd = dev_to_genpd(dev); | 383 | genpd = dev_to_genpd_safe(dev); |
384 | if (IS_ERR(genpd)) | 384 | if (!genpd) |
385 | return -ENODEV; | 385 | return -ENODEV; |
386 | 386 | ||
387 | if (unlikely(!genpd->set_performance_state)) | 387 | if (unlikely(!genpd->set_performance_state)) |