Skip to contentSkip to conversation

usb: avoid NULL check before free

PATCH New Heinrich Schuchardt 2 participants 2 messages Apr 19, 2020 – Apr 20, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 usb: avoid NULL check before free

The free() function checks if the argument is NULL. Do not duplicate this check.

---
 drivers/usb/host/ehci-hcd.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/usb/host/ehci-hcd.c +3 -6
index 1edb344d0f..a2a85db1e7 100644
@@ -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
#1 lore raw

PATCH 1/1 usb: avoid NULL check before free

Quoted 30 lines · Heinrich Schuchardt

The free() function checks if the argument is NULL. Do not duplicate this check.

---
 drivers/usb/host/ehci-hcd.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/usb/host/ehci-hcd.c +3 -7
index 1edb344d0f..a2a85db1e7 100644
@@ -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;
 }
--
Quoted 1 line

2.25.1

Applied, thanks