Commit 51dcf748 authored by Ulf Hansson's avatar Ulf Hansson Committed by Rafael J. Wysocki
Browse files

PM / Domains: Use the base device for driver_deferred_probe_check_state() 



When genpd fails to attach a device to one of its multiple PM domains,
we end up calling driver_deferred_probe_check_state() for the recently
allocated virtual device. This is incorrect, as it's the base device
that is being probed.

Fix this by passing along the base device to __genpd_dev_pm_attach()
and use that instead.

Fixes: e01afc32 ("PM / Domains: Stop deferring probe at the end of initcall")
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 40aa4db6

drivers/base/power/domain.c

+5 −5
Original line number Diff line number Diff line
@@ -2405,8 +2405,8 @@ static void genpd_dev_pm_sync(struct device *dev) 
	genpd_queue_power_off_work(pd);

}



static int __genpd_dev_pm_attach(struct device *dev, unsigned int index,

				 bool power_on)

static int __genpd_dev_pm_attach(struct device *dev, struct device *base_dev,

				 unsigned int index, bool power_on)

{

	struct of_phandle_args pd_args;

	struct generic_pm_domain *pd;
@@ -2424,7 +2424,7 @@ static int __genpd_dev_pm_attach(struct device *dev, unsigned int index, 
		mutex_unlock(&gpd_list_lock);

		dev_dbg(dev, "%s() failed to find PM domain: %ld\n",

			__func__, PTR_ERR(pd));

		return driver_deferred_probe_check_state(dev);

		return driver_deferred_probe_check_state(base_dev);

	}



	dev_dbg(dev, "adding to PM domain %s\n", pd->name);
@@ -2480,7 +2480,7 @@ int genpd_dev_pm_attach(struct device *dev) 
				       "#power-domain-cells") != 1)

		return 0;



	return __genpd_dev_pm_attach(dev, 0, true);

	return __genpd_dev_pm_attach(dev, dev, 0, true);

}

EXPORT_SYMBOL_GPL(genpd_dev_pm_attach);
@@ -2533,7 +2533,7 @@ struct device *genpd_dev_pm_attach_by_id(struct device *dev, 
	}



	/* Try to attach the device to the PM domain at the specified index. */

	ret = __genpd_dev_pm_attach(virt_dev, index, false);

	ret = __genpd_dev_pm_attach(virt_dev, dev, index, false);

	if (ret < 1) {

		device_unregister(virt_dev);

		return ret ? ERR_PTR(ret) : NULL;