From: Felipe Balbi Date: Fri, 6 Apr 2018 08:04:21 +0000 (+0300) Subject: usb: dwc3: gadget: simplify short packet event X-Git-Tag: Ubuntu-5.2.0-15.16~4284^2~81^2~34 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=d80fe1b6e34d39ded5718f9433350c0d823c21d6;p=mirror_ubuntu-eoan-kernel.git usb: dwc3: gadget: simplify short packet event We know that only OUT endpoints can trigger SHORT. We also know that count MUST be > 0 whenever SHORT triggers. Signed-off-by: Felipe Balbi --- diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 7fa8b15021e8..752d615c959b 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -2221,7 +2221,6 @@ static int dwc3_gadget_ep_reclaim_completed_trb(struct dwc3_ep *dep, const struct dwc3_event_depevt *event, int status, int chain) { unsigned int count; - unsigned int s_pkt = 0; dwc3_ep_inc_deq(dep); @@ -2256,12 +2255,7 @@ static int dwc3_gadget_ep_reclaim_completed_trb(struct dwc3_ep *dep, if ((trb->ctrl & DWC3_TRB_CTRL_HWO) && status != -ESHUTDOWN) return 1; - if (!dep->direction) { - if (count && (event->status & DEPEVT_STATUS_SHORT)) - s_pkt = 1; - } - - if (s_pkt && !chain) + if (event->status & DEPEVT_STATUS_SHORT && !chain) return 1; if ((event->status & DEPEVT_STATUS_IOC) &&