Commit 55cb8f40 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Greg Kroah-Hartman

driver core: Partially revert "driver core: correct device's shutdown order"

commit 722e5f2b upstream.

Commit 52cdbdd4 (driver core: correct device's shutdown order)
introduced a regression by breaking device shutdown on some systems.

Namely, the devices_kset_move_last() call in really_probe() added by
that commit is a mistake as it may cause parents to follow children
in the devices_kset list which then causes shutdown to fail.  For
example, if a device has children before really_probe() is called
for it (which is not uncommon), that call will cause it to be
reordered after the children in the devices_kset list and the
ordering of that list will not reflect the correct device shutdown
order any more.

Also it causes the devices_kset list to be constantly reordered
until all drivers have been probed which is totally pointless
overhead in the majority of cases and it only covered an issue
with system shutdown, while system-wide suspend/resume potentially
had the same issue on the affected platforms (which was not covered).

Moreover, the shutdown issue originally addressed by the change in
really_probe() made by commit 52cdbdd4 is not present in 4.18-rc
any more, since dra7 started to use the sdhci-omap driver which
doesn't disable any regulators during shutdown, so the really_probe()
part of commit 52cdbdd4 can be safely reverted.  [The original
issue was related to the omap_hsmmc driver used by dra7 previously.]

For the above reasons, revert the really_probe() modifications made
by commit 52cdbdd4.

The other code changes made by commit 52cdbdd4 are useful and
they need not be reverted.

Fixes: 52cdbdd4 (driver core: correct device's shutdown order)
Link: default avatarPingfan Liu <>
Tested-by: default avatarPingfan Liu <>
Reviewed-by: default avatarKishon Vijay Abraham I <>
Signed-off-by: default avatarRafael J. Wysocki <>
Cc: stable <>
Signed-off-by: default avatarGreg Kroah-Hartman <>
parent 5421694d
......@@ -401,14 +401,6 @@ static int really_probe(struct device *dev, struct device_driver *drv)
goto probe_failed;
* Ensure devices are listed in devices_kset in correct order
* It's important to move Dev to the end of devices_kset before
* calling .probe, because it could be recursive and parent Dev
* should always go first
if (dev->bus->probe) {
ret = dev->bus->probe(dev);
if (ret)
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment