Re: [PATCH] usb: xhci: return an error if the host is not halted

[Mathias Nyman <mathias.nyman@linux.intel.com>]

On 9/18/26 13:17, Henry Tseng wrote:
> On Wed,  2 Sep 2026 18:15:10 +0800, Henry Tseng <henrytseng@qnap.com> wrote:
>> xhci_reset() returns 0 when the host is not halted, without ever writing
>> CMD_RESET. Every other path that fails to reset the host returns an
>> error, so callers that check the return value are told the reset
>> succeeded on the one path where it did not happen.
>>
>> Return -EBUSY when the reset is aborted because the host is not halted.
>>
>> Signed-off-by: Henry Tseng <henrytseng@qnap.com>
>> ---
>>   drivers/usb/host/xhci.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
>> index a9e47e178c28..2af6a7b91e55 100644
>> --- a/drivers/usb/host/xhci.c
>> +++ b/drivers/usb/host/xhci.c
>> @@ -195,7 +195,7 @@ int xhci_reset(struct xhci_hcd *xhci, u64 timeout_us)
>>   
>>   	if ((state & STS_HALT) == 0) {
>>   		xhci_warn(xhci, "Host controller not halted, aborting reset.\n");
>> -		return 0;
>> +		return -EBUSY;
>>   	}
>>   
>>   	xhci_dbg_trace(xhci, trace_xhci_dbg_init, "// Reset the HC");
>> -- 
>> 2.43.0
>>
>>
> Hi Mathias,
> 
> A gentle ping on this one. Please let me know if the approach needs any
> changes.

Patch added to queue, thanks

Mathias