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

Commit c578abbc authored by Cornelia Huck's avatar Cornelia Huck Committed by Greg Kroah-Hartman
Browse files

driver core: Don't stop probing on ->probe errors. 



Don't stop on the first ->probe error that is not -ENODEV/-ENXIO.

There might be a driver registered returning an unresonable return code, and
this stops probing completely even though it may make sense to try the next
possible driver. At worst, we may end up with an unbound device.

Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent fbfb1445

drivers/base/dd.c

+6 −7
Original line number Diff line number Diff line
@@ -136,18 +136,17 @@ static int really_probe(void *void_data) 
	driver_sysfs_remove(dev);

	dev->driver = NULL;



	if (ret == -ENODEV || ret == -ENXIO) {

		/* Driver matched, but didn't support device

		 * or device not found.

		 * Not an error; keep going.

		 */

		ret = 0;

	} else {

	if (ret != -ENODEV && ret != -ENXIO) {

		/* driver matched but the probe failed */

		printk(KERN_WARNING

		       "%s: probe of %s failed with error %d\n",

		       drv->name, dev->bus_id, ret);

	}

	/*

	 * Ignore errors returned by ->probe so that the next driver can try

	 * its luck.

	 */

	ret = 0;

done:

	kfree(data);

	atomic_dec(&probe_count);