shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-11 05:17:10 +09:00
Code Issues Packages Projects Releases Wiki Activity

UPSTREAM: usb: dwc3: gadget: return errors from __dwc3_gadget_start_isoc()

Browse Source 
Sometimes, errors happen when kicking transfers from
__dwc3_gadget_start_isoc(). In those cases, we need to pass along the
error so gadget driver can make informed decisions.

Change-Id: Ibbb3ae70c4521c99a9ee465868f8c7a656504ad7
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: William Wu <william.wu@rock-chips.com>
(cherry picked from commit 25abad6a05)
This commit is contained in:
Felipe Balbi
2018-08-14 10:41:19 +03:00
committed by Tao Huang
parent 01c2b3687f
commit 3880e89d1f
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/usb/dwc3/gadget.c
View File

@@ -1300,7 +1300,7 @@ static int __dwc3_gadget_get_frame(struct dwc3 *dwc)
* Synopsys STAR 9001202023: Wrong microframe number for isochronous IN
* endpoints.
*/
static void dwc3_gadget_start_isoc_quirk(struct dwc3_ep *dep)
static int dwc3_gadget_start_isoc_quirk(struct dwc3_ep *dep)
{
int cmd_status = 0;
bool test0;
@@ -1330,7 +1330,7 @@ static void dwc3_gadget_start_isoc_quirk(struct dwc3_ep *dep)
if (cmd_status && cmd_status != -EAGAIN) {
dep->start_cmd_status = 0;
dep->combo_num = 0;
return;
return 0;
}
/* Store the first test status */
@@ -1345,7 +1345,7 @@ static void dwc3_gadget_start_isoc_quirk(struct dwc3_ep *dep)
*/
if (cmd_status == 0) {
dwc3_stop_active_transfer(dep, true);
return;
return 0;
}
}
@@ -1370,10 +1370,10 @@ static void dwc3_gadget_start_isoc_quirk(struct dwc3_ep *dep)
dep->start_cmd_status = 0;
dep->combo_num = 0;
__dwc3_gadget_kick_transfer(dep);
return __dwc3_gadget_kick_transfer(dep);
}
static void __dwc3_gadget_start_isoc(struct dwc3_ep *dep)
static int __dwc3_gadget_start_isoc(struct dwc3_ep *dep)
{
struct dwc3 *dwc = dep->dwc;
@@ -1381,7 +1381,7 @@ static void __dwc3_gadget_start_isoc(struct dwc3_ep *dep)
dev_info(dep->dwc->dev, "%s: ran out of requests\n",
dep->name);
dep->flags |= DWC3_EP_PENDING_REQUEST;
return;
return -EAGAIN;
}
if (!dwc->dis_start_transfer_quirk && dwc3_is_usb31(dwc) &&
@@ -1390,14 +1390,12 @@ static void __dwc3_gadget_start_isoc(struct dwc3_ep *dep)
dwc->version_type >= DWC31_VERSIONTYPE_EA01 &&
dwc->version_type <= DWC31_VERSIONTYPE_EA06))) {
if (dwc->gadget.speed <= USB_SPEED_HIGH && dep->direction) {
dwc3_gadget_start_isoc_quirk(dep);
return;
}
if (dwc->gadget.speed <= USB_SPEED_HIGH && dep->direction)
return dwc3_gadget_start_isoc_quirk(dep);
}
dep->frame_number = DWC3_ALIGN_FRAME(dep);
__dwc3_gadget_kick_transfer(dep);
return __dwc3_gadget_kick_transfer(dep);
}
static int __dwc3_gadget_ep_queue(struct dwc3_ep *dep, struct dwc3_request *req)
@@ -1438,8 +1436,7 @@ static int __dwc3_gadget_ep_queue(struct dwc3_ep *dep, struct dwc3_request *req)
if ((dep->flags & DWC3_EP_PENDING_REQUEST)) {
if (!(dep->flags & DWC3_EP_TRANSFER_STARTED)) {
__dwc3_gadget_start_isoc(dep);
return 0;
return __dwc3_gadget_start_isoc(dep);
}
}
}
@@ -2500,7 +2497,7 @@ static void dwc3_gadget_endpoint_transfer_not_ready(struct dwc3_ep *dep,
const struct dwc3_event_depevt *event)
{
dwc3_gadget_endpoint_frame_from_event(dep, event);
__dwc3_gadget_start_isoc(dep);
(void) __dwc3_gadget_start_isoc(dep);
}
static void dwc3_endpoint_interrupt(struct dwc3 *dwc,