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

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

Pull USB bugfixes from Greg KH:
 "Here are some small USB bugfixes for 6.3-rc6 that have been in my
  tree, and in linux-next, for a while. Included in here are:

   - new usb-serial driver device ids

   - xhci bugfixes for reported problems

   - gadget driver bugfixes for reported problems

   - dwc3 new device id

  All have been in linux-next with no reported problems"

* tag 'usb-6.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  usb: cdnsp: Fixes error: uninitialized symbol 'len'
  usb: gadgetfs: Fix ep_read_iter to handle ITER_UBUF
  usb: gadget: f_fs: Fix ffs_epfile_read_iter to handle ITER_UBUF
  usb: typec: altmodes/displayport: Fix configure initial pin assignment
  usb: dwc3: pci: add support for the Intel Meteor Lake-S
  xhci: Free the command allocated for setting LPM if we return early
  Revert "usb: xhci-pci: Set PROBE_PREFER_ASYNCHRONOUS"
  xhci: also avoid the XHCI_ZERO_64B_REGS quirk with a passthrough iommu
  USB: serial: option: add Quectel RM500U-CN modem
  usb: xhci: tegra: fix sleep in atomic call
  USB: serial: option: add Telit FE990 compositions
  USB: serial: cp210x: add Silicon Labs IFS-USB-DATACABLE IDs
parents a79d5c76 1edf4899

drivers/usb/cdns3/cdnsp-ep0.c

+1 −2
Original line number Diff line number Diff line
@@ -414,7 +414,7 @@ static int cdnsp_ep0_std_request(struct cdnsp_device *pdev, 
void cdnsp_setup_analyze(struct cdnsp_device *pdev)

{

	struct usb_ctrlrequest *ctrl = &pdev->setup;

	int ret = 0;

	int ret = -EINVAL;

	u16 len;



	trace_cdnsp_ctrl_req(ctrl);
@@ -424,7 +424,6 @@ void cdnsp_setup_analyze(struct cdnsp_device *pdev) 


	if (pdev->gadget.state == USB_STATE_NOTATTACHED) {

		dev_err(pdev->dev, "ERR: Setup detected in unattached state\n");

		ret = -EINVAL;

		goto out;

	}

drivers/usb/dwc3/dwc3-pci.c

+4 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
#define PCI_DEVICE_ID_INTEL_RPLS		0x7a61

#define PCI_DEVICE_ID_INTEL_MTLM		0x7eb1

#define PCI_DEVICE_ID_INTEL_MTLP		0x7ec1

#define PCI_DEVICE_ID_INTEL_MTLS		0x7f6f

#define PCI_DEVICE_ID_INTEL_MTL			0x7e7e

#define PCI_DEVICE_ID_INTEL_TGL			0x9a15

#define PCI_DEVICE_ID_AMD_MR			0x163a
@@ -474,6 +475,9 @@ static const struct pci_device_id dwc3_pci_id_table[] = { 
	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_MTLP),

	  (kernel_ulong_t) &dwc3_pci_intel_swnode, },



	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_MTLS),

	  (kernel_ulong_t) &dwc3_pci_intel_swnode, },



	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_MTL),

	  (kernel_ulong_t) &dwc3_pci_intel_swnode, },

drivers/usb/gadget/function/f_fs.c

+1 −1
Original line number Diff line number Diff line
@@ -1251,7 +1251,7 @@ static ssize_t ffs_epfile_read_iter(struct kiocb *kiocb, struct iov_iter *to) 
	p->kiocb = kiocb;

	if (p->aio) {

		p->to_free = dup_iter(&p->data, to, GFP_KERNEL);

		if (!p->to_free) {

		if (!iter_is_ubuf(&p->data) && !p->to_free) {

			kfree(p);

			return -ENOMEM;

		}

drivers/usb/gadget/legacy/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -614,7 +614,7 @@ ep_read_iter(struct kiocb *iocb, struct iov_iter *to) 
		if (!priv)

			goto fail;

		priv->to_free = dup_iter(&priv->to, to, GFP_KERNEL);

		if (!priv->to_free) {

		if (!iter_is_ubuf(&priv->to) && !priv->to_free) {

			kfree(priv);

			goto fail;

		}

drivers/usb/host/xhci-pci.c

+3 −4
Original line number Diff line number Diff line
@@ -771,12 +771,11 @@ static struct pci_driver xhci_pci_driver = { 
	/* suspend and resume implemented later */



	.shutdown = 	usb_hcd_pci_shutdown,

	.driver = {

#ifdef CONFIG_PM

		.pm = &usb_hcd_pci_pm_ops,

#endif

		.probe_type = PROBE_PREFER_ASYNCHRONOUS,

	.driver = {

		.pm = &usb_hcd_pci_pm_ops

	},

#endif

};



static int __init xhci_pci_init(void)