diff options
authorTomeu Vizoso <tomeu.vizoso@collabora.com>2016-09-15 14:05:23 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-09-17 00:56:34 +0200
commit609bed67bd8f72981faba75d80b3b48d746b7206 (patch)
parent17926551c98a4ff5d7fa3a574c60534fedb3f2c6 (diff)
PM / Domains: Allow holes in genpd_data.domains array
In platforms such as Rockchip's, the array of domains isn't always filled without holes, as which domains are present depend on the particular SoC revision. By allowing holes to be in the array, such SoCs can still use a single set of constants to index the array of power domains. Fixes: 0159ec670763 (PM / Domains: Verify the PM domain is present when adding a provider) Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com> Acked-by: Jon Hunter <jonathanh@nvidia.com> Acked-by: Ulf Hansson <ulf.hansson@linaro.org> Reviewed-by: Heiko Stuebner <heiko@sntech.de> Tested-by: Heiko Stuebner <heiko@sntech.de> Acked-by: Kevin Hilman <khilman@baylibre.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index b0cf46d..83ae3d7 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -1581,6 +1581,8 @@ int of_genpd_add_provider_onecell(struct device_node *np,
for (i = 0; i < data->num_domains; i++) {
+ if (!data->domains[i])
+ continue;
if (!pm_genpd_present(data->domains[i]))
goto error;
@@ -1598,6 +1600,8 @@ int of_genpd_add_provider_onecell(struct device_node *np,
while (i--) {
+ if (!data->domains[i])
+ continue;
data->domains[i]->provider = NULL;
data->domains[i]->has_provider = false;