[PATCH] fixup! usb: xhci: Guard all calls to xhci_wait_for_event

Marek Vasut marex at denx.de
Fri Oct 27 02:36:10 CEST 2023


On 10/27/23 01:26, Hector Martin wrote:
> Gah, I should've paid more attention to that rebase. Here's a dumb
> fixup for this patch. I'll squash it into a v2 if needed alongside
> any other changes, or if it looks good feel free to apply/squash
> it in directly.
> 
> ---
>   drivers/usb/host/xhci-ring.c | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
> index e2bd2e999a8e..7f2507be0cf0 100644
> --- a/drivers/usb/host/xhci-ring.c
> +++ b/drivers/usb/host/xhci-ring.c
> @@ -532,6 +532,7 @@ static void reset_ep(struct usb_device *udev, int ep_index)
>   	event = xhci_wait_for_event(ctrl, TRB_COMPLETION);
>   	if (!event)
>   		return;
> +	field = le32_to_cpu(event->trans_event.flags);
>   	BUG_ON(TRB_TO_SLOT_ID(field) != udev->slot_id);
>   	xhci_acknowledge_event(ctrl);

Please squash, and add

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

Also, +CC Minda,

there has been a similar fix to this one but with much more information 
about the failure, see:

[PATCH v1] usb: xhci: Check return value of wait for TRB_TRANSFER event

I think it would be useful to somehow include that information, so it 
wouldn't be lost.


More information about the U-Boot mailing list