From: Ulf Hansson Date: Mon, 14 May 2018 14:52:37 +0000 (+0200) Subject: PM / Domains: Don't return -EEXIST at attach when PM domain exists X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=94ef9b8e2b941ab7e7ce88fa48ce626fa529bf2f;p=openwrt%2Fstaging%2Fblogic.git PM / Domains: Don't return -EEXIST at attach when PM domain exists As dev_pm_domain_attach() isn't the only way to assign PM domain pointers to devices, clearly we must allow a device to have the pointer already being assigned. For this reason, return 0 instead of -EEXIST. Reported-by: Krzysztof Kozlowski Signed-off-by: Ulf Hansson Tested-by: Tested-by: Krzysztof Kozlowski Tested-by: Tony Lindgren Signed-off-by: Rafael J. Wysocki --- diff --git a/drivers/base/power/common.c b/drivers/base/power/common.c index 5e4b481595bd..390868c2b392 100644 --- a/drivers/base/power/common.c +++ b/drivers/base/power/common.c @@ -106,7 +106,7 @@ int dev_pm_domain_attach(struct device *dev, bool power_on) int ret; if (dev->pm_domain) - return -EEXIST; + return 0; ret = acpi_dev_pm_attach(dev, power_on); if (!ret)