Commit 7f6cd540 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
  USB: Close usb_find_interface race v3
  Revert "USB: Close usb_find_interface race"
parents e956e6b7 c2d284ee

drivers/usb/core/usb.c

+16 −7
Original line number Diff line number Diff line
@@ -167,18 +167,23 @@ struct usb_host_interface *usb_altnum_to_altsetting( 
}

EXPORT_SYMBOL_GPL(usb_altnum_to_altsetting);



struct find_interface_arg {

	int minor;

	struct device_driver *drv;

};



static int __find_interface(struct device *dev, void *data)

{

	int *minor = data;

	struct find_interface_arg *arg = data;

	struct usb_interface *intf;



	if (!is_usb_interface(dev))

		return 0;



	intf = to_usb_interface(dev);

	if (intf->minor != -1 && intf->minor == *minor)

		return 1;

	if (dev->driver != arg->drv)

		return 0;

	intf = to_usb_interface(dev);

	return intf->minor == arg->minor;

}



/**
@@ -187,14 +192,18 @@ static int __find_interface(struct device *dev, void *data) 
 * @minor: the minor number of the desired device

 *

 * This walks the bus device list and returns a pointer to the interface

 * with the matching minor.  Note, this only works for devices that share the

 * USB major number.

 * with the matching minor and driver.  Note, this only works for devices

 * that share the USB major number.

 */

struct usb_interface *usb_find_interface(struct usb_driver *drv, int minor)

{

	struct find_interface_arg argb;

	struct device *dev;



	dev = bus_find_device(&usb_bus_type, NULL, &minor, __find_interface);

	argb.minor = minor;

	argb.drv = &drv->drvwrap.driver;



	dev = bus_find_device(&usb_bus_type, NULL, &argb, __find_interface);



	/* Drop reference count from bus_find_device */

	put_device(dev);