linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] usb: host: pci_quirks: fix memory leak, by adding iounmap
@ 2015-11-06 12:16 Saurabh Sengar
  2015-11-30  6:28 ` Saurabh Sengar
  2015-12-01 22:35 ` Greg KH
  0 siblings, 2 replies; 13+ messages in thread
From: Saurabh Sengar @ 2015-11-06 12:16 UTC (permalink / raw)
  To: mathias.nyman, gregkh, linux-usb, linux-kernel; +Cc: Saurabh Sengar

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);
 }
 
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* Re: [PATCH] usb: host: pci_quirks: fix memory leak, by adding iounmap
  2015-11-06 12:16 [PATCH] usb: host: pci_quirks: fix memory leak, by adding iounmap Saurabh Sengar
@ 2015-11-30  6:28 ` Saurabh Sengar
  2015-11-30  9:05   ` Mathias Nyman
  2015-12-01 22:35 ` Greg KH
  1 sibling, 1 reply; 13+ messages in thread
From: Saurabh Sengar @ 2015-11-30  6:28 UTC (permalink / raw)
  To: mathias.nyman, Greg KH, linux-usb, linux-kernel; +Cc: Saurabh Sengar

pinging in case this patch is lost.


On 6 November 2015 at 17:46, Saurabh Sengar <saurabh.truth@gmail.com> 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);
>  }
>
> --
> 1.9.1
>

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH] usb: host: pci_quirks: fix memory leak, by adding iounmap
  2015-11-30  6:28 ` Saurabh Sengar
@ 2015-11-30  9:05   ` Mathias Nyman
  0 siblings, 0 replies; 13+ messages in thread
From: Mathias Nyman @ 2015-11-30  9:05 UTC (permalink / raw)
  To: Saurabh Sengar, Greg KH, linux-usb, linux-kernel

On 30.11.2015 08:28, Saurabh Sengar wrote:
> pinging in case this patch is lost.
>
>
> On 6 November 2015 at 17:46, Saurabh Sengar <saurabh.truth@gmail.com> 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);
>>   }
>>
>> --
>> 1.9.1
>>

Thanks, I'll add it send it forward soon

-Mathias

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH] usb: host: pci_quirks: fix memory leak, by adding iounmap
  2015-11-06 12:16 [PATCH] usb: host: pci_quirks: fix memory leak, by adding iounmap Saurabh Sengar
  2015-11-30  6:28 ` Saurabh Sengar
@ 2015-12-01 22:35 ` Greg KH
  2015-12-02  3:38   ` Saurabh Sengar
  1 sibling, 1 reply; 13+ messages in thread
From: Greg KH @ 2015-12-01 22:35 UTC (permalink / raw)
  To: Saurabh Sengar; +Cc: mathias.nyman, linux-usb, linux-kernel

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 :(

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH] usb: host: pci_quirks: fix memory leak, by adding iounmap
  2015-12-01 22:35 ` Greg KH
@ 2015-12-02  3:38   ` Saurabh Sengar
  2015-12-02 15:45     ` Greg KH
  0 siblings, 1 reply; 13+ messages in thread
From: Saurabh Sengar @ 2015-12-02  3:38 UTC (permalink / raw)
  To: Greg KH; +Cc: mathias.nyman, linux-usb, linux-kernel

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 ?

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH] usb: host: pci_quirks: fix memory leak, by adding iounmap
  2015-12-02  3:38   ` Saurabh Sengar
@ 2015-12-02 15:45     ` Greg KH
  2015-12-02 15:55       ` Saurabh Sengar
  0 siblings, 1 reply; 13+ messages in thread
From: Greg KH @ 2015-12-02 15:45 UTC (permalink / raw)
  To: Saurabh Sengar; +Cc: mathias.nyman, linux-usb, linux-kernel

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

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH] usb: host: pci_quirks: fix memory leak, by adding iounmap
  2015-12-02 15:45     ` Greg KH
@ 2015-12-02 15:55       ` Saurabh Sengar
  2015-12-02 16:29         ` Greg KH
  0 siblings, 1 reply; 13+ messages in thread
From: Saurabh Sengar @ 2015-12-02 15:55 UTC (permalink / raw)
  To: Greg KH; +Cc: mathias.nyman, linux-usb, linux-kernel

Hi Greg,

I am little unclear.
Now, shall I resend my patch on top of usb.git tree or linux.git tree.

Regards,
Saurabh

On 2 December 2015 at 21:15, Greg KH <gregkh@linuxfoundation.org> wrote:
> 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

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH] usb: host: pci_quirks: fix memory leak, by adding iounmap
  2015-12-02 15:55       ` Saurabh Sengar
@ 2015-12-02 16:29         ` Greg KH
  2015-12-02 17:21           ` [PATCH v2] " Saurabh Sengar
  0 siblings, 1 reply; 13+ messages in thread
From: Greg KH @ 2015-12-02 16:29 UTC (permalink / raw)
  To: Saurabh Sengar; +Cc: mathias.nyman, linux-usb, linux-kernel

On Wed, Dec 02, 2015 at 09:25:53PM +0530, Saurabh Sengar wrote:
> Hi Greg,
> 
> I am little unclear.
> Now, shall I resend my patch on top of usb.git tree or linux.git tree.

The usb-next branch of the usb.git tree please.

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [PATCH v2] usb: host: pci_quirks: fix memory leak, by adding iounmap
  2015-12-02 16:29         ` Greg KH
@ 2015-12-02 17:21           ` Saurabh Sengar
  2015-12-04 16:23             ` Greg KH
  0 siblings, 1 reply; 13+ messages in thread
From: Saurabh Sengar @ 2015-12-02 17:21 UTC (permalink / raw)
  To: gregkh, mathias.nyman, linux-usb, linux-kernel; +Cc: Saurabh Sengar

added iounmap inorder to free memory mapped to base before returning

Signed-off-by: Saurabh Sengar <saurabh.truth@gmail.com>
---
v2: changed logic a bit, because of recent patches pushed to usb-next
 drivers/usb/host/pci-quirks.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
index 26cb8c8..2ac198c 100644
--- a/drivers/usb/host/pci-quirks.c
+++ b/drivers/usb/host/pci-quirks.c
@@ -992,7 +992,7 @@ static void quirk_usb_handoff_xhci(struct pci_dev *pdev)
 	if ((ext_cap_offset + sizeof(val)) > len) {
 		/* We're reading garbage from the controller */
 		dev_warn(&pdev->dev, "xHCI controller failing to respond");
-		return;
+		goto hc_init;
 	}
 	val = readl(base + ext_cap_offset);
 
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* Re: [PATCH v2] usb: host: pci_quirks: fix memory leak, by adding iounmap
  2015-12-02 17:21           ` [PATCH v2] " Saurabh Sengar
@ 2015-12-04 16:23             ` Greg KH
  2015-12-04 16:31               ` Saurabh Sengar
  2015-12-04 16:39               ` [PATCH v3] " Saurabh Sengar
  0 siblings, 2 replies; 13+ messages in thread
From: Greg KH @ 2015-12-04 16:23 UTC (permalink / raw)
  To: Saurabh Sengar; +Cc: mathias.nyman, linux-usb, linux-kernel

On Wed, Dec 02, 2015 at 10:51:37PM +0530, Saurabh Sengar wrote:
> added iounmap inorder to free memory mapped to base before returning
> 
> Signed-off-by: Saurabh Sengar <saurabh.truth@gmail.com>
> ---
> v2: changed logic a bit, because of recent patches pushed to usb-next
>  drivers/usb/host/pci-quirks.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
> index 26cb8c8..2ac198c 100644
> --- a/drivers/usb/host/pci-quirks.c
> +++ b/drivers/usb/host/pci-quirks.c
> @@ -992,7 +992,7 @@ static void quirk_usb_handoff_xhci(struct pci_dev *pdev)
>  	if ((ext_cap_offset + sizeof(val)) > len) {
>  		/* We're reading garbage from the controller */
>  		dev_warn(&pdev->dev, "xHCI controller failing to respond");
> -		return;
> +		goto hc_init;

Are you sure this is correct?  That goto location then does a whole
bunch of things with the xhci controller that you just now determined is
failing to respond.  I can't take this as-is, sorry.

greg k-h

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH v2] usb: host: pci_quirks: fix memory leak, by adding iounmap
  2015-12-04 16:23             ` Greg KH
@ 2015-12-04 16:31               ` Saurabh Sengar
  2015-12-04 16:39               ` [PATCH v3] " Saurabh Sengar
  1 sibling, 0 replies; 13+ messages in thread
From: Saurabh Sengar @ 2015-12-04 16:31 UTC (permalink / raw)
  To: Greg KH; +Cc: mathias.nyman, linux-usb, linux-kernel

On 4 December 2015 at 21:53, Greg KH <gregkh@linuxfoundation.org> wrote:
> On Wed, Dec 02, 2015 at 10:51:37PM +0530, Saurabh Sengar wrote:
>> added iounmap inorder to free memory mapped to base before returning
>>
>> Signed-off-by: Saurabh Sengar <saurabh.truth@gmail.com>
>> ---
>> v2: changed logic a bit, because of recent patches pushed to usb-next
>>  drivers/usb/host/pci-quirks.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
>> index 26cb8c8..2ac198c 100644
>> --- a/drivers/usb/host/pci-quirks.c
>> +++ b/drivers/usb/host/pci-quirks.c
>> @@ -992,7 +992,7 @@ static void quirk_usb_handoff_xhci(struct pci_dev *pdev)
>>       if ((ext_cap_offset + sizeof(val)) > len) {
>>               /* We're reading garbage from the controller */
>>               dev_warn(&pdev->dev, "xHCI controller failing to respond");
>> -             return;
>> +             goto hc_init;
>
> Are you sure this is correct?  That goto location then does a whole
> bunch of things with the xhci controller that you just now determined is
> failing to respond.  I can't take this as-is, sorry.
>
> greg k-h

Yes I agree, and in the first patch I didn't do this way.
But the latest patch which got introduced is doing "goto hc_init" at line 990

        ext_cap_offset = xhci_find_next_ext_cap(base, 0, XHCI_EXT_CAPS_LEGACY);

        if (!ext_cap_offset)
                goto hc_init;

I think this is wrong too, may be I am wrong.

Any way I will send the first patch again on top of usb-next as v3

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [PATCH v3] usb: host: pci_quirks: fix memory leak, by adding iounmap
  2015-12-04 16:23             ` Greg KH
  2015-12-04 16:31               ` Saurabh Sengar
@ 2015-12-04 16:39               ` Saurabh Sengar
  1 sibling, 0 replies; 13+ messages in thread
From: Saurabh Sengar @ 2015-12-04 16:39 UTC (permalink / raw)
  To: gregkh, mathias.nyman, linux-usb, linux-kernel; +Cc: Saurabh Sengar

added iounmap inorder to free memory mapped to base before returning

Signed-off-by: Saurabh Sengar <saurabh.truth@gmail.com>
---
v3: reverted to v1 logic, on top of usb-next branch
 drivers/usb/host/pci-quirks.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
index 26cb8c8..35af362 100644
--- a/drivers/usb/host/pci-quirks.c
+++ b/drivers/usb/host/pci-quirks.c
@@ -992,7 +992,7 @@ static void quirk_usb_handoff_xhci(struct pci_dev *pdev)
 	if ((ext_cap_offset + sizeof(val)) > len) {
 		/* We're reading garbage from the controller */
 		dev_warn(&pdev->dev, "xHCI controller failing to respond");
-		return;
+		goto iounmap;
 	}
 	val = readl(base + ext_cap_offset);
 
@@ -1055,6 +1055,7 @@ hc_init:
 			 XHCI_MAX_HALT_USEC, val);
 	}
 
+iounmap:
 	iounmap(base);
 }
 
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH] usb: host: pci_quirks: fix memory leak, by adding iounmap
@ 2016-02-11  9:42 Saurabh Sengar
  0 siblings, 0 replies; 13+ messages in thread
From: Saurabh Sengar @ 2016-02-11  9:42 UTC (permalink / raw)
  To: mathias.nyman, gregkh, linux-usb, linux-kernel; +Cc: Saurabh Sengar

Added iounmap inorder to free memory mapped to pointer before returning

Signed-off-by: Saurabh Sengar <saurabh.truth@gmail.com>
---
 drivers/usb/host/pci-quirks.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
index 26cb8c8..35af362 100644
--- a/drivers/usb/host/pci-quirks.c
+++ b/drivers/usb/host/pci-quirks.c
@@ -992,7 +992,7 @@ static void quirk_usb_handoff_xhci(struct pci_dev *pdev)
 	if ((ext_cap_offset + sizeof(val)) > len) {
 		/* We're reading garbage from the controller */
 		dev_warn(&pdev->dev, "xHCI controller failing to respond");
-		return;
+		goto iounmap;
 	}
 	val = readl(base + ext_cap_offset);
 
@@ -1055,6 +1055,7 @@ hc_init:
 			 XHCI_MAX_HALT_USEC, val);
 	}
 
+iounmap:
 	iounmap(base);
 }
 
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2016-02-11  9:43 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-11-06 12:16 [PATCH] usb: host: pci_quirks: fix memory leak, by adding iounmap Saurabh Sengar
2015-11-30  6:28 ` Saurabh Sengar
2015-11-30  9:05   ` Mathias Nyman
2015-12-01 22:35 ` Greg KH
2015-12-02  3:38   ` Saurabh Sengar
2015-12-02 15:45     ` Greg KH
2015-12-02 15:55       ` Saurabh Sengar
2015-12-02 16:29         ` Greg KH
2015-12-02 17:21           ` [PATCH v2] " Saurabh Sengar
2015-12-04 16:23             ` Greg KH
2015-12-04 16:31               ` Saurabh Sengar
2015-12-04 16:39               ` [PATCH v3] " Saurabh Sengar
2016-02-11  9:42 [PATCH] " Saurabh Sengar

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).