Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1281930

Re: [PATCH] usb: host: pci_quirks: fix memory leak, by adding iounmap

Show all headers | View raw

On Wed, Dec 02, 2015 at 09:08:06AM +0530, Saurabh Sengar wrote:
> On 2 December 2015 at 04:05, Greg KH <gregkh@linuxfoundation.org> wrote:
> > On Fri, Nov 06, 2015 at 05:46:30PM +0530, Saurabh Sengar wrote:
> >> added iounmap inorder to free memory mapped to base before returning
> >>
> >> Signed-off-by: Saurabh Sengar <saurabh.truth@gmail.com>
> >> ---
> >>  drivers/usb/host/pci-quirks.c | 4 ++--
> >>  1 file changed, 2 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
> >> index f940056..332f687 100644
> >> --- a/drivers/usb/host/pci-quirks.c
> >> +++ b/drivers/usb/host/pci-quirks.c
> >> @@ -990,7 +990,7 @@ static void quirk_usb_handoff_xhci(struct pci_dev *pdev)
> >>                       /* We're reading garbage from the controller */
> >>                       dev_warn(&pdev->dev,
> >>                                "xHCI controller failing to respond");
> >> -                     return;
> >> +                     goto iounmap;
> >>               }
> >>
> >>               if (!ext_cap_offset)
> >> @@ -1061,7 +1061,7 @@ hc_init:
> >>                        "xHCI HW did not halt within %d usec status = 0x%x\n",
> >>                        XHCI_MAX_HALT_USEC, val);
> >>       }
> >> -
> >> +iounmap:
> >>       iounmap(base);
> >>  }
> >>
> >
> > Does not apply to the tree :(
> 
> 
> This patch applies fine on top of
> "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git".
> Just now only I have re-verified.
> Am I expected to send this patch on top of some other git tree/branch ?

It will end up going in the usb.git tree, on the usb-next branch, and it
conflicts with other xhci patches that just landed there ahead of yours.
So it's not your fault, you did the right thing, just others also did
work here so you need to redo yours as well, a normal thing in kernel
development :)

hope this helps explain things.

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

Re: [PATCH] usb: host: pci_quirks: fix memory leak, by adding iounmap Greg KH <gregkh@linuxfoundation.org> - 2015-12-01 23:40 +0100
  Re: [PATCH] usb: host: pci_quirks: fix memory leak, by adding iounmap Saurabh Sengar <saurabh.truth@gmail.com> - 2015-12-02 04:40 +0100
    Re: [PATCH] usb: host: pci_quirks: fix memory leak, by adding iounmap Greg KH <gregkh@linuxfoundation.org> - 2015-12-02 16:50 +0100
      Re: [PATCH] usb: host: pci_quirks: fix memory leak, by adding iounmap Saurabh Sengar <saurabh.truth@gmail.com> - 2015-12-02 17:00 +0100
        Re: [PATCH] usb: host: pci_quirks: fix memory leak, by adding iounmap Greg KH <gregkh@linuxfoundation.org> - 2015-12-02 17:30 +0100
          [PATCH v2] usb: host: pci_quirks: fix memory leak, by adding iounmap Saurabh Sengar <saurabh.truth@gmail.com> - 2015-12-02 18:30 +0100
            Re: [PATCH v2] usb: host: pci_quirks: fix memory leak, by adding  iounmap Greg KH <gregkh@linuxfoundation.org> - 2015-12-04 17:30 +0100
              Re: [PATCH v2] usb: host: pci_quirks: fix memory leak, by adding iounmap Saurabh Sengar <saurabh.truth@gmail.com> - 2015-12-04 17:40 +0100
              [PATCH v3] usb: host: pci_quirks: fix memory leak, by adding iounmap Saurabh Sengar <saurabh.truth@gmail.com> - 2015-12-04 18:00 +0100

csiph-web