diff options
author | Jesper Juhl <juhl-lkml@dif.dk> | 2005-04-18 20:39:34 -0400 |
---|---|---|
committer | Greg K-H <gregkh@suse.de> | 2005-04-18 20:39:34 -0400 |
commit | 1bc3c9e1e44c2059fe2ffa6ff70ad0a925d7b05f (patch) | |
tree | 0bc14ec53acf3b4c08a9995c7ea335e236435558 /drivers/usb/host | |
parent | 6fd19f4b55f7fd1c9d8650bd7f8df2c81b69c5ca (diff) |
[PATCH] USB: kfree cleanup for drivers/usb/* - no need to check for NULL
Get rid of a bunch of redundant NULL pointer checks in drivers/usb/*,
there's no need to check a pointer for NULL before calling kfree() on it.
Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Index: gregkh-2.6/drivers/usb/class/audio.c
===================================================================
Diffstat (limited to 'drivers/usb/host')
-rw-r--r-- | drivers/usb/host/ehci-mem.c | 3 | ||||
-rw-r--r-- | drivers/usb/host/uhci-hcd.c | 7 |
2 files changed, 3 insertions, 7 deletions
diff --git a/drivers/usb/host/ehci-mem.c b/drivers/usb/host/ehci-mem.c index 9938697ff361..5c38ad869485 100644 --- a/drivers/usb/host/ehci-mem.c +++ b/drivers/usb/host/ehci-mem.c | |||
@@ -156,8 +156,7 @@ static void ehci_mem_cleanup (struct ehci_hcd *ehci) | |||
156 | ehci->periodic = NULL; | 156 | ehci->periodic = NULL; |
157 | 157 | ||
158 | /* shadow periodic table */ | 158 | /* shadow periodic table */ |
159 | if (ehci->pshadow) | 159 | kfree(ehci->pshadow); |
160 | kfree (ehci->pshadow); | ||
161 | ehci->pshadow = NULL; | 160 | ehci->pshadow = NULL; |
162 | } | 161 | } |
163 | 162 | ||
diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c index 98745a072d6f..49bd83ee0c75 100644 --- a/drivers/usb/host/uhci-hcd.c +++ b/drivers/usb/host/uhci-hcd.c | |||
@@ -890,8 +890,7 @@ up_failed: | |||
890 | debugfs_remove(uhci_debugfs_root); | 890 | debugfs_remove(uhci_debugfs_root); |
891 | 891 | ||
892 | debug_failed: | 892 | debug_failed: |
893 | if (errbuf) | 893 | kfree(errbuf); |
894 | kfree(errbuf); | ||
895 | 894 | ||
896 | errbuf_failed: | 895 | errbuf_failed: |
897 | 896 | ||
@@ -906,9 +905,7 @@ static void __exit uhci_hcd_cleanup(void) | |||
906 | warn("not all urb_priv's were freed!"); | 905 | warn("not all urb_priv's were freed!"); |
907 | 906 | ||
908 | debugfs_remove(uhci_debugfs_root); | 907 | debugfs_remove(uhci_debugfs_root); |
909 | 908 | kfree(errbuf); | |
910 | if (errbuf) | ||
911 | kfree(errbuf); | ||
912 | } | 909 | } |
913 | 910 | ||
914 | module_init(uhci_hcd_init); | 911 | module_init(uhci_hcd_init); |