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

Commit 8d02a9a8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB fixes from Greg KH:
 "Here are some small USB fixes for 5.1-rc3.

  Nothing major at all here, just a small collection of fixes for
  reported issues, and potential problems with error handling paths.
  Also a few new device ids, as normal.

  All of these have been in linux-next with no reported issues"

* tag 'usb-5.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (25 commits)
  USB: serial: option: add Olicard 600
  USB: serial: cp210x: add new device id
  usb: u132-hcd: fix resource leak
  usb: cdc-acm: fix race during wakeup blocking TX traffic
  usb: mtu3: fix EXTCON dependency
  usb: usb251xb: fix to avoid potential NULL pointer dereference
  usb: core: Try generic PHY_MODE_USB_HOST if usb_phy_roothub_set_mode fails
  phy: sun4i-usb: Support set_mode to USB_HOST for non-OTG PHYs
  xhci: Don't let USB3 ports stuck in polling state prevent suspend
  usb: xhci: dbc: Don't free all memory with spinlock held
  xhci: Fix port resume done detection for SS ports with LPM enabled
  USB: serial: mos7720: fix mos_parport refcount imbalance on error path
  USB: gadget: f_hid: fix deadlock in f_hidg_write()
  usb: gadget: net2272: Fix net2272_dequeue()
  usb: gadget: net2280: Fix net2280_dequeue()
  usb: gadget: net2280: Fix overrun of OUT messages
  usb: dwc3: pci: add support for Comet Lake PCH ID
  usb: usb251xb: Remove unnecessary comparison of unsigned integer with >= 0
  usb: common: Consider only available nodes for dr_mode
  usb: typec: tcpm: Try PD-2.0 if sink does not respond to 3.0 source-caps
  ...
parents 782492a7 d65d25b8

drivers/phy/allwinner/phy-sun4i-usb.c

+4 −1
Original line number Diff line number Diff line
@@ -485,8 +485,11 @@ static int sun4i_usb_phy_set_mode(struct phy *_phy, 
	struct sun4i_usb_phy_data *data = to_sun4i_usb_phy_data(phy);

	int new_mode;



	if (phy->index != 0)

	if (phy->index != 0) {

		if (mode == PHY_MODE_USB_HOST)

			return 0;

		return -EINVAL;

	}



	switch (mode) {

	case PHY_MODE_USB_HOST:

drivers/usb/class/cdc-acm.c

+1 −3
Original line number Diff line number Diff line
@@ -558,10 +558,8 @@ static void acm_softint(struct work_struct *work) 
		clear_bit(EVENT_RX_STALL, &acm->flags);

	}



	if (test_bit(EVENT_TTY_WAKEUP, &acm->flags)) {

	if (test_and_clear_bit(EVENT_TTY_WAKEUP, &acm->flags))

		tty_port_tty_wakeup(&acm->port);

		clear_bit(EVENT_TTY_WAKEUP, &acm->flags);

	}

}



/*

drivers/usb/common/common.c

+2 −0
Original line number Diff line number Diff line
@@ -145,6 +145,8 @@ enum usb_dr_mode of_usb_get_dr_mode_by_phy(struct device_node *np, int arg0) 


	do {

		controller = of_find_node_with_property(controller, "phys");

		if (!of_device_is_available(controller))

			continue;

		index = 0;

		do {

			if (arg0 == -1) {

drivers/usb/core/hcd.c

+3 −0
Original line number Diff line number Diff line
@@ -2741,6 +2741,9 @@ int usb_add_hcd(struct usb_hcd *hcd, 


		retval = usb_phy_roothub_set_mode(hcd->phy_roothub,

						  PHY_MODE_USB_HOST_SS);

		if (retval)

			retval = usb_phy_roothub_set_mode(hcd->phy_roothub,

							  PHY_MODE_USB_HOST);

		if (retval)

			goto err_usb_phy_roothub_power_on;

drivers/usb/dwc3/dwc3-pci.c

+4 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#define PCI_DEVICE_ID_INTEL_BXT_M		0x1aaa

#define PCI_DEVICE_ID_INTEL_APL			0x5aaa

#define PCI_DEVICE_ID_INTEL_KBP			0xa2b0

#define PCI_DEVICE_ID_INTEL_CMLH		0x02ee

#define PCI_DEVICE_ID_INTEL_GLK			0x31aa

#define PCI_DEVICE_ID_INTEL_CNPLP		0x9dee

#define PCI_DEVICE_ID_INTEL_CNPH		0xa36e
@@ -305,6 +306,9 @@ static const struct pci_device_id dwc3_pci_id_table[] = { 
	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_MRFLD),

	  (kernel_ulong_t) &dwc3_pci_mrfld_properties, },



	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_CMLH),

	  (kernel_ulong_t) &dwc3_pci_intel_properties, },



	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_SPTLP),

	  (kernel_ulong_t) &dwc3_pci_intel_properties, },