Merge "usb: dwc3: Don't check usb isochronous endpoint check for ep0" (1b4975d2) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/usb/dwc3/gadget.c

+7 −5

Original line number	Diff line number	Diff line
		@@ -1497,11 +1497,6 @@ int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value, int protocol)
		struct dwc3 *dwc = dep->dwc;
		int ret;

		if (usb_endpoint_xfer_isoc(dep->endpoint.desc)) {
		dev_err(dwc->dev, "%s is of Isochronous type\n", dep->name);
		return -EINVAL;
		}

		memset(&params, 0x00, sizeof(params));

		if (value) {
		@@ -1549,7 +1544,14 @@ static int dwc3_gadget_ep_set_halt(struct usb_ep *ep, int value)

		spin_lock_irqsave(&dwc->lock, flags);
		dbg_event(dep->number, "HALT", value);
		if (usb_endpoint_xfer_isoc(dep->endpoint.desc)) {
		dev_err(dwc->dev, "%s is of Isochronous type\n", dep->name);
		ret = -EINVAL;
		goto out;
		}

		ret = __dwc3_gadget_ep_set_halt(dep, value, false);
		out:
		spin_unlock_irqrestore(&dwc->lock, flags);

		return ret;