Commit 5cbd4521 authored by Robert Sprowson's avatar Robert Sprowson

On stall cancel the transfer's timeout too

When an endpoint stalls, make sure the xfer's timeout is cancelled before setting up the background clear operation, otherwise the stall is cleared and a few seconds later an attempt is made to work with the (stale, or possibly even reused) xfer struct in xhci_timeout().
Merged from NetBSD revision 1.28.2.74.

Version 0.26. Tagged as 'XHCIDriver-0_26'
parent c6061ab1
/* (0.25)
/* (0.26)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 0.25
#define Module_MajorVersion_CMHG 0.26
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 22 Feb 2018
#define Module_Date_CMHG 29 Mar 2018
#define Module_MajorVersion "0.25"
#define Module_Version 25
#define Module_MajorVersion "0.26"
#define Module_Version 26
#define Module_MinorVersion ""
#define Module_Date "22 Feb 2018"
#define Module_Date "29 Mar 2018"
#define Module_ApplicationDate "22-Feb-18"
#define Module_ApplicationDate "29-Mar-18"
#define Module_ComponentName "XHCIDriver"
#define Module_ComponentPath "mixed/RiscOS/Sources/HWSupport/USB/Controllers/XHCIDriver"
#define Module_FullVersion "0.25"
#define Module_HelpVersion "0.25 (22 Feb 2018)"
#define Module_LibraryVersionInfo "0:25"
#define Module_FullVersion "0.26"
#define Module_HelpVersion "0.26 (29 Mar 2018)"
#define Module_LibraryVersionInfo "0:26"
......@@ -1636,6 +1636,7 @@ xhci_handle_event(struct xhci_softc * const sc,
* UF_ENDPOINT_HALT).
*/
xfer->status=err;
callout_stop(&xfer->timeout_handle);
xhci_clear_endpoint_stall_async(xfer);
return;
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment