Commit c9140487 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: isp1362: fix build failure on ARM systems via irq_flags cleanup
  USB: isp1362: better 64bit printf warning fixes
  USB: fix usbstorage for 2770:915d delivers no FAT
  USB: Fix level of isp1760 Reloading ptd error message
  USB: FHCI: avoid NULL pointer dereference
  USB: Fix duplicate sysfs problem after device reset.
  USB: add speed values for USB 3.0 and wireless controllers
  USB: add missing delay during remote wakeup
  USB: EHCI & UHCI: fix race between root-hub suspend and port resume
  USB: EHCI: fix handling of unusual interrupt intervals
  USB: Don't use GFP_KERNEL while we cannot reset a storage device
  USB: fix bitmask merge error
  usb: serial: fix memory leak in generic driver
  USB: serial: fix USB serial fix kfifo_len locking
parents 456eac94 0a2fea2e

drivers/usb/core/devices.c

+1 −1
Original line number Diff line number Diff line
@@ -494,7 +494,7 @@ static ssize_t usb_device_dump(char __user **buffer, size_t *nbytes, 
		return 0;

	/* allocate 2^1 pages = 8K (on i386);

	 * should be more than enough for one device */

	pages_start = (char *)__get_free_pages(GFP_KERNEL, 1);

	pages_start = (char *)__get_free_pages(GFP_NOIO, 1);

	if (!pages_start)

		return -ENOMEM;

drivers/usb/core/hcd.c

+18 −0
Original line number Diff line number Diff line
@@ -1684,6 +1684,24 @@ int usb_hcd_alloc_bandwidth(struct usb_device *udev, 
		}

	}

	if (cur_alt && new_alt) {

		struct usb_interface *iface = usb_ifnum_to_if(udev,

				cur_alt->desc.bInterfaceNumber);



		if (iface->resetting_device) {

			/*

			 * The USB core just reset the device, so the xHCI host

			 * and the device will think alt setting 0 is installed.

			 * However, the USB core will pass in the alternate

			 * setting installed before the reset as cur_alt.  Dig

			 * out the alternate setting 0 structure, or the first

			 * alternate setting if a broken device doesn't have alt

			 * setting 0.

			 */

			cur_alt = usb_altnum_to_altsetting(iface, 0);

			if (!cur_alt)

				cur_alt = &iface->altsetting[0];

		}



		/* Drop all the endpoints in the current alt setting */

		for (i = 0; i < cur_alt->desc.bNumEndpoints; i++) {

			ret = hcd->driver->drop_endpoint(hcd, udev,

drivers/usb/core/hub.c

+8 −10
Original line number Diff line number Diff line
@@ -3347,6 +3347,9 @@ static void hub_events(void) 
					USB_PORT_FEAT_C_SUSPEND);

				udev = hdev->children[i-1];

				if (udev) {

					/* TRSMRCY = 10 msec */

					msleep(10);



					usb_lock_device(udev);

					ret = remote_wakeup(hdev->

							children[i-1]);
@@ -3692,19 +3695,14 @@ static int usb_reset_and_verify_device(struct usb_device *udev) 
			usb_enable_interface(udev, intf, true);

			ret = 0;

		} else {

			/* We've just reset the device, so it will think alt

			 * setting 0 is installed.  For usb_set_interface() to

			 * work properly, we need to set the current alternate

			 * interface setting to 0 (or the first alt setting, if

			 * the device doesn't have alt setting 0).

			 */

			intf->cur_altsetting =

				usb_find_alt_setting(config, i, 0);

			if (!intf->cur_altsetting)

				intf->cur_altsetting =

					&config->intf_cache[i]->altsetting[0];

			/* Let the bandwidth allocation function know that this

			 * device has been reset, and it will have to use

			 * alternate setting 0 as the current alternate setting.

			 */

			intf->resetting_device = 1;

			ret = usb_set_interface(udev, desc->bInterfaceNumber,

					desc->bAlternateSetting);

			intf->resetting_device = 0;

		}

		if (ret < 0) {

			dev_err(&udev->dev, "failed to restore interface %d "

drivers/usb/core/message.c

+4 −4
Original line number Diff line number Diff line
@@ -906,11 +906,11 @@ char *usb_cache_string(struct usb_device *udev, int index) 
	if (index <= 0)

		return NULL;



	buf = kmalloc(MAX_USB_STRING_SIZE, GFP_KERNEL);

	buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);

	if (buf) {

		len = usb_string(udev, index, buf, MAX_USB_STRING_SIZE);

		if (len > 0) {

			smallbuf = kmalloc(++len, GFP_KERNEL);

			smallbuf = kmalloc(++len, GFP_NOIO);

			if (!smallbuf)

				return buf;

			memcpy(smallbuf, buf, len);
@@ -1731,7 +1731,7 @@ int usb_set_configuration(struct usb_device *dev, int configuration) 
	if (cp) {

		nintf = cp->desc.bNumInterfaces;

		new_interfaces = kmalloc(nintf * sizeof(*new_interfaces),

				GFP_KERNEL);

				GFP_NOIO);

		if (!new_interfaces) {

			dev_err(&dev->dev, "Out of memory\n");

			return -ENOMEM;
@@ -1740,7 +1740,7 @@ int usb_set_configuration(struct usb_device *dev, int configuration) 
		for (; n < nintf; ++n) {

			new_interfaces[n] = kzalloc(

					sizeof(struct usb_interface),

					GFP_KERNEL);

					GFP_NOIO);

			if (!new_interfaces[n]) {

				dev_err(&dev->dev, "Out of memory\n");

				ret = -ENOMEM;

drivers/usb/core/sysfs.c

+6 −0
Original line number Diff line number Diff line
@@ -115,6 +115,12 @@ show_speed(struct device *dev, struct device_attribute *attr, char *buf) 
	case USB_SPEED_HIGH:

		speed = "480";

		break;

	case USB_SPEED_VARIABLE:

		speed = "480";

		break;

	case USB_SPEED_SUPER:

		speed = "5000";

		break;

	default:

		speed = "unknown";

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE