* [PATCH] usb: avoid NULL check before free
@ 2020-04-19 10:02 Heinrich Schuchardt
2020-04-20 1:43 ` Marek Vasut
0 siblings, 1 reply; 2+ messages in thread
From: Heinrich Schuchardt @ 2020-04-19 10:02 UTC (permalink / raw)
To: u-boot
The free() function checks if the argument is NULL.
Do not duplicate this check.
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
---
drivers/usb/host/ehci-hcd.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 1edb344d0f..a2a85db1e7 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -1413,13 +1413,10 @@ static struct int_queue *_ehci_create_int_queue(struct usb_device *dev,
debug("Exit create_int_queue\n");
return result;
fail3:
- if (result->tds)
- free(result->tds);
+ free(result->tds);
fail2:
- if (result->first)
- free(result->first);
- if (result)
- free(result);
+ free(result->first);
+ free(result);
fail1:
return NULL;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* [PATCH] usb: avoid NULL check before free
2020-04-19 10:02 [PATCH] usb: avoid NULL check before free Heinrich Schuchardt
@ 2020-04-20 1:43 ` Marek Vasut
0 siblings, 0 replies; 2+ messages in thread
From: Marek Vasut @ 2020-04-20 1:43 UTC (permalink / raw)
To: u-boot
On 4/19/20 12:02 PM, Heinrich Schuchardt wrote:
> The free() function checks if the argument is NULL.
> Do not duplicate this check.
>
> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
> ---
> drivers/usb/host/ehci-hcd.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
> index 1edb344d0f..a2a85db1e7 100644
> --- a/drivers/usb/host/ehci-hcd.c
> +++ b/drivers/usb/host/ehci-hcd.c
> @@ -1413,13 +1413,10 @@ static struct int_queue *_ehci_create_int_queue(struct usb_device *dev,
> debug("Exit create_int_queue\n");
> return result;
> fail3:
> - if (result->tds)
> - free(result->tds);
> + free(result->tds);
> fail2:
> - if (result->first)
> - free(result->first);
> - if (result)
> - free(result);
> + free(result->first);
> + free(result);
> fail1:
> return NULL;
> }
> --
> 2.25.1
Applied, thanks
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-04-20 1:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-19 10:02 [PATCH] usb: avoid NULL check before free Heinrich Schuchardt
2020-04-20 1:43 ` Marek Vasut
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox