[RESEND PATCH] usb: core: config: fix SS companion log for interrupt endpoints

[RESEND PATCH] usb: core: config: fix SS companion log for interrupt endpoints

[raoxu]

From: Xu Rao <raoxu@uniontech.com>

usb_parse_ss_endpoint_companion() clears bmAttributes when it is
non-zero for control or interrupt endpoints.

The diagnostic message reports Control for control endpoints and Bulk
for the other branch. However, the other branch can only be an
interrupt endpoint because bulk endpoints are handled by the following
else-if branch.

Report the endpoint type as Interrupt instead of Bulk to avoid
misleading descriptor diagnostics.

Signed-off-by: Xu Rao <raoxu@uniontech.com>
---
 drivers/usb/core/config.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c
index 45e20c6d76c0..cd3231d21090 100644
--- a/drivers/usb/core/config.c
+++ b/drivers/usb/core/config.c
@@ -151,7 +151,7 @@ static void usb_parse_ss_endpoint_companion(struct device *ddev, int cfgno,
 			usb_endpoint_xfer_int(&ep->desc)) &&
 				desc->bmAttributes != 0) {
 		dev_notice(ddev, "%s endpoint with bmAttributes = %d in config %d interface %d altsetting %d ep 0x%X: setting to zero\n",
-				usb_endpoint_xfer_control(&ep->desc) ? "Control" : "Bulk",
+				usb_endpoint_xfer_control(&ep->desc) ? "Control" : "Interrupt",
 				desc->bmAttributes,
 				cfgno, inum, asnum, ep->desc.bEndpointAddress);
 		ep->ss_ep_comp.bmAttributes = 0;
--
2.50.1

Re: [RESEND PATCH] usb: core: config: fix SS companion log for interrupt endpoints

[Greg KH]

On Thu, Jul 02, 2026 at 04:11:04PM +0800, raoxu wrote:
> From: Xu Rao <raoxu@uniontech.com>
> 
> usb_parse_ss_endpoint_companion() clears bmAttributes when it is
> non-zero for control or interrupt endpoints.
> 
> The diagnostic message reports Control for control endpoints and Bulk
> for the other branch. However, the other branch can only be an
> interrupt endpoint because bulk endpoints are handled by the following
> else-if branch.
> 
> Report the endpoint type as Interrupt instead of Bulk to avoid
> misleading descriptor diagnostics.
> 
> Signed-off-by: Xu Rao <raoxu@uniontech.com>
> ---
>  drivers/usb/core/config.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Why is this RESEND?  Always say so below the --- line.

thanks,

greg k-h

Re: [RESEND PATCH] USB: core: report interrupt endpoint correctly in companion descriptor diagnostic

[raoxu]

Hi Greg,

The original submission received an Acked-by, but it was not picked up.
I resent the unchanged patch to bring it back to attention.

Sorry, I should have stated the reason below the --- line.

Ack reply:
https://lore.kernel.org/linux-usb/077ba20b-9677-4812-a083-b5216281611e@linux.intel.com/

Thanks,
Xu Rao

Re: [RESEND PATCH] USB: core: report interrupt endpoint correctly in companion descriptor diagnostic

[raoxu]

Hi Greg,

> > interrupt endpoint because bulk endpoints are handled by the following
> > else-if branch.
> >
> > Report the endpoint type as Interrupt instead of Bulk to avoid
> > misleading descriptor diagnostics.
> >
> > Signed-off-by: Xu Rao <raoxu@uniontech.com>
> > ---
> >  drivers/usb/core/config.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
>
> Why is this RESEND?  Always say so below the --- line.

The original submission received an Acked-by, but it was not picked up.
I resent the unchanged patch to bring it back to attention.

Sorry, I should have stated the reason below the --- line.

Ack reply:
https://lore.kernel.org/linux-usb/077ba20b-9677-4812-a083-b5216281611e@linux.intel.com/

Thanks,
Xu Rao

Re: [RESEND PATCH] USB: core: report interrupt endpoint correctly in companion descriptor diagnostic

[Greg KH]

On Thu, Jul 02, 2026 at 05:26:55PM +0800, raoxu wrote:
> Hi Greg,
> 
> > > interrupt endpoint because bulk endpoints are handled by the following
> > > else-if branch.
> > >
> > > Report the endpoint type as Interrupt instead of Bulk to avoid
> > > misleading descriptor diagnostics.
> > >
> > > Signed-off-by: Xu Rao <raoxu@uniontech.com>
> > > ---
> > >  drivers/usb/core/config.c | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > Why is this RESEND?  Always say so below the --- line.
> 
> The original submission received an Acked-by, but it was not picked up.
> I resent the unchanged patch to bring it back to attention.

So you dropped the Ack now?  That's not ok, just respond to the original
thread.

But realize that the merge window just ended, and I'm staring down
thousands of pending patches.  If you wish to see patches applied
sooner, please help review other ones.

thanks,

rgeg k-h