[PATCH v2 6/8] usb: xhci: Do not panic on event timeouts

Marek Vasut marex at denx.de
Sun Oct 29 15:35:33 CET 2023


On 10/29/23 07:37, Hector Martin wrote:
> Now that we always check the return value, just return NULL on timeouts.
> We can still log the error since this is a problem, but it's not reason
> to panic.
> 
> Signed-off-by: Hector Martin <marcan at marcan.st>
> ---
>   drivers/usb/host/xhci-ring.c | 5 +++--
>   1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
> index a969eafdc8ee..ae0ab5744df0 100644
> --- a/drivers/usb/host/xhci-ring.c
> +++ b/drivers/usb/host/xhci-ring.c
> @@ -494,8 +494,9 @@ union xhci_trb *xhci_wait_for_event(struct xhci_ctrl *ctrl, trb_type expected)
>   	if (expected == TRB_TRANSFER)
>   		return NULL;
>   
> -	printf("XHCI timeout on event type %d... cannot recover.\n", expected);
> -	BUG();
> +	printf("XHCI timeout on event type %d...\n", expected);
> +
> +	return NULL;

Reviewed-by: Marek Vasut <marex at denx.de>


More information about the U-Boot mailing list