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

Commit 0ff26c66 authored by Adrian Hunter's avatar Adrian Hunter Committed by Greg Kroah-Hartman
Browse files

driver core: Fix device link deferred probe 



A device probe deferred because of a device link is never probed again
because it is not added to the deferred_probe_pending_list. Add it, taking
care of the race with driver_deferred_probe_trigger().

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Reviewed-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2b2d8788

drivers/base/dd.c

+12 −4
Original line number Diff line number Diff line
@@ -350,6 +350,15 @@ EXPORT_SYMBOL_GPL(device_bind_driver); 
static atomic_t probe_count = ATOMIC_INIT(0);

static DECLARE_WAIT_QUEUE_HEAD(probe_waitqueue);



static void driver_deferred_probe_add_trigger(struct device *dev,

					      int local_trigger_count)

{

	driver_deferred_probe_add(dev);

	/* Did a trigger occur while probing? Need to re-trigger if yes */

	if (local_trigger_count != atomic_read(&deferred_trigger_count))

		driver_deferred_probe_trigger();

}



static int really_probe(struct device *dev, struct device_driver *drv)

{

	int ret = -EPROBE_DEFER;
@@ -369,6 +378,8 @@ static int really_probe(struct device *dev, struct device_driver *drv) 
	}



	ret = device_links_check_suppliers(dev);

	if (ret == -EPROBE_DEFER)

		driver_deferred_probe_add_trigger(dev, local_trigger_count);

	if (ret)

		return ret;
@@ -469,10 +480,7 @@ static int really_probe(struct device *dev, struct device_driver *drv) 
	case -EPROBE_DEFER:

		/* Driver requested deferred probing */

		dev_dbg(dev, "Driver %s requests probe deferral\n", drv->name);

		driver_deferred_probe_add(dev);

		/* Did a trigger occur while probing? Need to re-trigger if yes */

		if (local_trigger_count != atomic_read(&deferred_trigger_count))

			driver_deferred_probe_trigger();

		driver_deferred_probe_add_trigger(dev, local_trigger_count);

		break;

	case -ENODEV:

	case -ENXIO: