فهرست منبع

usb: dwc3: gadget: fix endpoint renaming

We were exitting the function before actually
renaming anything. While at that, also always leave
control endpoint un-renamed.

Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Felipe Balbi 9 سال پیش
والد
کامیت
e901aa159d
1فایلهای تغییر یافته به همراه3 افزوده شده و 2 حذف شده
  1. 3 2
      drivers/usb/dwc3/gadget.c

+ 3 - 2
drivers/usb/dwc3/gadget.c

@@ -568,7 +568,7 @@ static int __dwc3_gadget_ep_enable(struct dwc3_ep *dep,
 		dwc3_writel(dwc->regs, DWC3_DALEPENA, reg);
 		dwc3_writel(dwc->regs, DWC3_DALEPENA, reg);
 
 
 		if (!usb_endpoint_xfer_isoc(desc))
 		if (!usb_endpoint_xfer_isoc(desc))
-			return 0;
+			goto out;
 
 
 		/* Link TRB for ISOC. The HWO bit is never reset */
 		/* Link TRB for ISOC. The HWO bit is never reset */
 		trb_st_hw = &dep->trb_pool[0];
 		trb_st_hw = &dep->trb_pool[0];
@@ -582,9 +582,10 @@ static int __dwc3_gadget_ep_enable(struct dwc3_ep *dep,
 		trb_link->ctrl |= DWC3_TRB_CTRL_HWO;
 		trb_link->ctrl |= DWC3_TRB_CTRL_HWO;
 	}
 	}
 
 
+out:
 	switch (usb_endpoint_type(desc)) {
 	switch (usb_endpoint_type(desc)) {
 	case USB_ENDPOINT_XFER_CONTROL:
 	case USB_ENDPOINT_XFER_CONTROL:
-		strlcat(dep->name, "-control", sizeof(dep->name));
+		/* don't change name */
 		break;
 		break;
 	case USB_ENDPOINT_XFER_ISOC:
 	case USB_ENDPOINT_XFER_ISOC:
 		strlcat(dep->name, "-isoc", sizeof(dep->name));
 		strlcat(dep->name, "-isoc", sizeof(dep->name));