renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-22 12:14:01 +08:00
Code

PM / Domains: Don't allow an existing generic_pm_domain_data

Browse Source 
When adding a device to a genpd, a struct generic_pm_domain_data is
allocated per device.

Verify that there are no existing generic_pm_domain_data for the device
we are about to add, since that tells us it has already been added to a
genpd.

When genpd supported PM domain device callbacks, this was a valid
scenario. Now it isn't so let's return an error code.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Ulf Hansson 2015-01-27 21:13:40 +01:00 committed by Rafael J. Wysocki
parent c1dbe2fbb3
commit 14b5306488
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/base/power/domain.c
View File

@ -1444,26 +1444,30 @@ int __pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev,
if (ret)
goto out;
genpd->device_count++;
genpd->max_off_time_changed = true;
spin_lock_irq(&dev->power.lock);
dev->pm_domain = &genpd->domain;
if (dev->power.subsys_data->domain_data) {
gpd_data = to_gpd_data(dev->power.subsys_data->domain_data);
} else {
gpd_data = gpd_data_new;
dev->power.subsys_data->domain_data = &gpd_data->base;
spin_unlock_irq(&dev->power.lock);
ret = -EINVAL;
goto out;
}
gpd_data = gpd_data_new;
dev->power.subsys_data->domain_data = &gpd_data->base;
if (td)
gpd_data->td = *td;
dev->pm_domain = &genpd->domain;
spin_unlock_irq(&dev->power.lock);
if (genpd->attach_dev)
genpd->attach_dev(genpd, dev);
genpd->device_count++;
genpd->max_off_time_changed = true;
mutex_lock(&gpd_data->lock);
gpd_data->base.dev = dev;
list_add_tail(&gpd_data->base.list_node, &genpd->dev_list);