Re: [PATCH 3/3] xhci: Free the command allocated for setting LPM if we return early

[Greg KH <gregkh@linuxfoundation.org>]

On Mon, Apr 03, 2023 at 09:17:21AM +0200, Mirsad Goran Todorovac wrote:
> Hi, Mathias!
> 
> On 30.3.2023. 16:30, Mathias Nyman wrote:
> > The command allocated to set exit latency LPM values need to be freed in
> > case the command is never queued. This would be the case if there is no
> > change in exit latency values, or device is missing.
> > 
> > Reported-by: Mirsad Goran Todorovac <mirsad.todorovac@alu.unizg.hr>
> > Link: https://lore.kernel.org/linux-usb/24263902-c9b3-ce29-237b-1c3d6918f4fe@alu.unizg.hr
> > Tested-by: Mirsad Goran Todorovac <mirsad.todorovac@alu.unizg.hr>
> > Fixes: 5c2a380a5aa8 ("xhci: Allocate separate command structures for each LPM command")
> > Cc: <Stable@vger.kernel.org>
> > Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
> > ---
> >   drivers/usb/host/xhci.c | 1 +
> >   1 file changed, 1 insertion(+)
> > 
> > diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
> > index bdb6dd819a3b..6307bae9cddf 100644
> > --- a/drivers/usb/host/xhci.c
> > +++ b/drivers/usb/host/xhci.c
> > @@ -4442,6 +4442,7 @@ static int __maybe_unused xhci_change_max_exit_latency(struct xhci_hcd *xhci,
> >   	if (!virt_dev || max_exit_latency == virt_dev->current_mel) {
> >   		spin_unlock_irqrestore(&xhci->lock, flags);
> > +		xhci_free_command(xhci, command);
> >   		return 0;
> >   	}
> 
> There seems to be a problem with applying this patch with "git am", as it
> gives the following:
> 
> commit ff9de97baa02cb9362b7cb81e95bc9be424cab89
> Author: @ <@>
> Date:   Mon Apr 3 08:42:33 2023 +0200
> 
>     The command allocated to set exit latency LPM values need to be freed in
>     case the command is never queued. This would be the case if there is no
>     change in exit latency values, or device is missing.
> 
>     Fixes: 5c2a380a5aa8 ("xhci: Allocate separate command structures for each LPM command")
>     Cc: <Stable@vger.kernel.org>
>     Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>

This is already commit f6caea485555 ("xhci: Free the command allocated
for setting LPM if we return early") in Linus's tree, do you not see it
there?

And how exactly did you save the message to apply it with 'git am'?  It
worked for me.

thanks,

greg k-h