PCI: allow pci driver to support only dynids (2debb4d2) · Commits · 戴 / test

commit (PCI: Check dynids driver_data value for validity) requires all drivers to include an id table to try and match driver_data. Before validating driver_data check driver has an id table. Acked-by:

Jean Delvare <khali@linux-fr.org> Cc: Milton Miller <miltonm@bga.com> Signed-off-by:

Chris Wright <chrisw@sous-sol.org> Signed-off-by:

Jesse Barnes <jbarnes@virtuousgeek.org>

drivers/pci/pci-driver.c

+11 −9

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ store_new_id(struct device_driver driver, const char buf, size_t count)
		subdevice=PCI_ANY_ID, class=0, class_mask=0;
		unsigned long driver_data=0;
		int fields=0;
		int retval;
		int retval=0;

		fields = sscanf(buf, "%x %x %x %x %x %x %lx",
		&vendor, &device, &subvendor, &subdevice,
		@@ -58,6 +58,7 @@ store_new_id(struct device_driver driver, const char buf, size_t count)

		/* Only accept driver_data values that match an existing id_table
		entry */
		if (ids) {
		retval = -EINVAL;
		while (ids->vendor \|\| ids->subvendor \|\| ids->class_mask) {
		if (driver_data == ids->driver_data) {
		@@ -68,6 +69,7 @@ store_new_id(struct device_driver driver, const char buf, size_t count)
		}
		if (retval) /* No match */
		return retval;
		}

		dynid = kzalloc(sizeof(*dynid), GFP_KERNEL);
		if (!dynid)

Admin message