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

Commit b86c1df1 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

[PATCH] Driver core: Fix up the driver and device iterators to be quieter 



Also stops looping over the lists when a match is found.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d0e2b4a0

drivers/base/dd.c

+19 −13
Original line number Diff line number Diff line
@@ -88,8 +88,8 @@ static int __device_attach(struct device_driver * drv, void * data) 
	int error;



	error = driver_probe_device(drv, dev);



	if (error == -ENODEV && error == -ENXIO) {

	if (error) {

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

			/* Driver matched, but didn't support device

			 * or device not found.

			 * Not an error; keep going.
@@ -101,7 +101,10 @@ static int __device_attach(struct device_driver * drv, void * data) 
			       "%s: probe of %s failed with error %d\n",

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

		}

	return 0;

		return error;

	}

	/* stop looking, this device is attached */

	return 1;

}



/**
@@ -137,7 +140,10 @@ static int __driver_attach(struct device * dev, void * data) 
				       drv->name, dev->bus_id, error);

			} else

				error = 0;

			return error;

		}

		/* stop looking, this driver is attached */

		return 1;

	}

	return 0;

}