Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5f9e5da authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'driver-core-4.18-rc7' of... 

Merge tag 'driver-core-4.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Pull driver core fix from Greg KH:
 "This is a single driver core fix for 4.18-rc7. It partially reverts a
  previous commit to resolve some reported issues.

  It has been in linux-next for a while now with no reported issues"

* tag 'driver-core-4.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  driver core: Partially revert "driver core: correct device's shutdown order"
parents 9bd59183 722e5f2b

drivers/base/dd.c

+0 −8
Original line number Diff line number Diff line
@@ -434,14 +434,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

	 */

	devices_kset_move_last(dev);



	if (dev->bus->probe) {

		ret = dev->bus->probe(dev);

		if (ret)