Commit 58d51f33 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'fixes-for-v5.10-rc2' of... 

Merge tag 'fixes-for-v5.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb

 into usb-linus

Felipe writes:

USB: fixes for v5.10-rc2

Nothing major as of yet, we're adding support for Intel Alder Lake-S
in dwc3, together with a few fixes that are quite important (memory
leak in raw-gadget, probe crashes in goku_udc, and so on).

Signed-off-by: default avatarFelipe Balbi <balbi@kernel.org>

* tag 'fixes-for-v5.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb:
  usb: raw-gadget: fix memory leak in gadget_setup
  usb: dwc2: Avoid leaving the error_debugfs label unused
  usb: dwc3: ep0: Fix delay status handling
  usb: gadget: fsl: fix null pointer checking
  usb: gadget: goku_udc: fix potential crashes in probe
  usb: dwc3: pci: add support for the Intel Alder Lake-S
parents 3cea11cd 129aa973

drivers/usb/dwc2/platform.c

+3 −0
Original line number Diff line number Diff line
@@ -608,10 +608,13 @@ static int dwc2_driver_probe(struct platform_device *dev) 
#endif /* CONFIG_USB_DWC2_PERIPHERAL || CONFIG_USB_DWC2_DUAL_ROLE */

	return 0;



#if IS_ENABLED(CONFIG_USB_DWC2_PERIPHERAL) || \

	IS_ENABLED(CONFIG_USB_DWC2_DUAL_ROLE)

error_debugfs:

	dwc2_debugfs_exit(hsotg);

	if (hsotg->hcd_enabled)

		dwc2_hcd_remove(hsotg);

#endif

error_drd:

	dwc2_drd_exit(hsotg);

drivers/usb/dwc3/dwc3-pci.c

+4 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#define PCI_DEVICE_ID_INTEL_TGPLP		0xa0ee

#define PCI_DEVICE_ID_INTEL_TGPH		0x43ee

#define PCI_DEVICE_ID_INTEL_JSP			0x4dee

#define PCI_DEVICE_ID_INTEL_ADLS		0x7ae1



#define PCI_INTEL_BXT_DSM_GUID		"732b85d5-b7a7-4a1b-9ba0-4bbd00ffd511"

#define PCI_INTEL_BXT_FUNC_PMU_PWR	4
@@ -367,6 +368,9 @@ static const struct pci_device_id dwc3_pci_id_table[] = { 
	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_JSP),

	  (kernel_ulong_t) &dwc3_pci_intel_properties, },



	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ADLS),

	  (kernel_ulong_t) &dwc3_pci_intel_properties, },



	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_NL_USB),

	  (kernel_ulong_t) &dwc3_pci_amd_properties, },

	{  }	/* Terminating Entry */

drivers/usb/dwc3/ep0.c

+2 −1
Original line number Diff line number Diff line
@@ -1058,10 +1058,11 @@ void dwc3_ep0_send_delayed_status(struct dwc3 *dwc) 
{

	unsigned int direction = !dwc->ep0_expect_in;



	dwc->delayed_status = false;



	if (dwc->ep0state != EP0_STATUS_PHASE)

		return;



	dwc->delayed_status = false;

	__dwc3_ep0_do_control_status(dwc, dwc->eps[direction]);

}

drivers/usb/gadget/legacy/raw_gadget.c

+4 −1
Original line number Diff line number Diff line
@@ -564,9 +564,12 @@ static int raw_ioctl_event_fetch(struct raw_dev *dev, unsigned long value) 
		return -ENODEV;

	}

	length = min(arg.length, event->length);

	if (copy_to_user((void __user *)value, event, sizeof(*event) + length))

	if (copy_to_user((void __user *)value, event, sizeof(*event) + length)) {

		kfree(event);

		return -EFAULT;

	}



	kfree(event);

	return 0;

}

drivers/usb/gadget/udc/fsl_udc_core.c

+1 −1
Original line number Diff line number Diff line
@@ -1051,7 +1051,7 @@ static int fsl_ep_fifo_status(struct usb_ep *_ep) 
	u32 bitmask;

	struct ep_queue_head *qh;



	if (!_ep || _ep->desc || !(_ep->desc->bEndpointAddress&0xF))

	if (!_ep || !_ep->desc || !(_ep->desc->bEndpointAddress&0xF))

		return -ENODEV;



	ep = container_of(_ep, struct fsl_ep, ep);

CRA Git | Maintained and supported by SUSTech CRA and CCSE