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

Commit ca033390 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'usb-3.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb 

Pull USB fixes from Greg KH:
 "Here is a bunch of USB fixes for 3.14-rc3.  Most of these are xhci
  reverts, fixing a bunch of reported issues with USB 3 host controller
  issues that loads of people have been hitting (with the exception of
  kernel developers, all of our machines seem to be working fine, which
  is why these took so long to get resolved...)

  There are some other minor fixes and new device ids, as ususal.  All
  have been in linux-next successfully"

* tag 'usb-3.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (22 commits)
  usb: option: blacklist ZTE MF667 net interface
  Revert "usb: xhci: Link TRB must not occur within a USB payload burst"
  Revert "xhci: Avoid infinite loop when sg urb requires too many trbs"
  Revert "xhci: Set scatter-gather limit to avoid failed block writes."
  xhci 1.0: Limit arbitrarily-aligned scatter gather.
  Modpost: fixed USB alias generation for ranges including 0x9 and 0xA
  usb: core: Fix potential memory leak adding dyn USBdevice IDs
  USB: ftdi_sio: add Tagsys RFID Reader IDs
  usb: qcserial: add Netgear Aircard 340U
  usb-storage: enable multi-LUN scanning when needed
  USB: simple: add Dynastream ANT USB-m Stick device support
  usb-storage: add unusual-devs entry for BlackBerry 9000
  usb-storage: restrict bcdDevice range for Super Top in Cypress ATACB
  usb: phy: move some error messages to debug
  usb: ftdi_sio: add Mindstorms EV3 console adapter
  usb: dwc2: fix memory corruption in dwc2 driver
  usb: dwc2: fix role switch breakage
  usb: dwc2: bail out early when booting with "nousb"
  Revert "xhci: replace xhci_read_64() with readq()"
  Revert "xhci: replace xhci_write_64() with writeq()"
  ...
parents 40a215fb 3635c7e2

drivers/usb/core/driver.c

+17 −7
Original line number Diff line number Diff line
@@ -63,8 +63,10 @@ ssize_t usb_store_new_id(struct usb_dynids *dynids, 
	dynid->id.idProduct = idProduct;

	dynid->id.match_flags = USB_DEVICE_ID_MATCH_DEVICE;

	if (fields > 2 && bInterfaceClass) {

		if (bInterfaceClass > 255)

			return -EINVAL;

		if (bInterfaceClass > 255) {

			retval = -EINVAL;

			goto fail;

		}



		dynid->id.bInterfaceClass = (u8)bInterfaceClass;

		dynid->id.match_flags |= USB_DEVICE_ID_MATCH_INT_CLASS;
@@ -73,17 +75,21 @@ ssize_t usb_store_new_id(struct usb_dynids *dynids, 
	if (fields > 4) {

		const struct usb_device_id *id = id_table;



		if (!id)

			return -ENODEV;

		if (!id) {

			retval = -ENODEV;

			goto fail;

		}



		for (; id->match_flags; id++)

			if (id->idVendor == refVendor && id->idProduct == refProduct)

				break;



		if (id->match_flags)

		if (id->match_flags) {

			dynid->id.driver_info = id->driver_info;

		else

			return -ENODEV;

		} else {

			retval = -ENODEV;

			goto fail;

		}

	}



	spin_lock(&dynids->lock);
@@ -95,6 +101,10 @@ ssize_t usb_store_new_id(struct usb_dynids *dynids, 
	if (retval)

		return retval;

	return count;



fail:

	kfree(dynid);

	return retval;

}

EXPORT_SYMBOL_GPL(usb_store_new_id);

drivers/usb/core/hcd.c

+0 −1
Original line number Diff line number Diff line
@@ -1032,7 +1032,6 @@ static int register_root_hub(struct usb_hcd *hcd) 
					dev_name(&usb_dev->dev), retval);

			return retval;

		}

		usb_dev->lpm_capable = usb_device_supports_lpm(usb_dev);

	}



	retval = usb_new_device (usb_dev);

drivers/usb/core/hub.c

+1 −6
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ struct usb_hub *usb_hub_to_struct_hub(struct usb_device *hdev) 
	return usb_get_intfdata(hdev->actconfig->interface[0]);

}



int usb_device_supports_lpm(struct usb_device *udev)

static int usb_device_supports_lpm(struct usb_device *udev)

{

	/* USB 2.1 (and greater) devices indicate LPM support through

	 * their USB 2.0 Extended Capabilities BOS descriptor.
@@ -149,11 +149,6 @@ int usb_device_supports_lpm(struct usb_device *udev) 
				"Power management will be impacted.\n");

		return 0;

	}



	/* udev is root hub */

	if (!udev->parent)

		return 1;



	if (udev->parent->lpm_capable)

		return 1;

drivers/usb/core/usb.h

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ extern int usb_get_device_descriptor(struct usb_device *dev, 
		unsigned int size);

extern int usb_get_bos_descriptor(struct usb_device *dev);

extern void usb_release_bos_descriptor(struct usb_device *dev);

extern int usb_device_supports_lpm(struct usb_device *udev);

extern char *usb_cache_string(struct usb_device *udev, int index);

extern int usb_set_configuration(struct usb_device *dev, int configuration);

extern int usb_choose_configuration(struct usb_device *udev);

drivers/usb/dwc2/core.c

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ static int dwc2_hs_phy_init(struct dwc2_hsotg *hsotg, bool select_phy) 
	int retval = 0;



	if (!select_phy)

		return -ENODEV;

		return 0;



	usbcfg = readl(hsotg->regs + GUSBCFG);