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/misc/auerswald.c | |
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/misc/auerswald.c')
-rw-r--r-- | drivers/usb/misc/auerswald.c | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/drivers/usb/misc/auerswald.c b/drivers/usb/misc/auerswald.c index a530bb976e43..6f7994f5a714 100644 --- a/drivers/usb/misc/auerswald.c +++ b/drivers/usb/misc/auerswald.c | |||
@@ -705,16 +705,12 @@ static int auerchain_control_msg (pauerchain_t acp, struct usb_device *dev, unsi | |||
705 | /* free a single auerbuf */ | 705 | /* free a single auerbuf */ |
706 | static void auerbuf_free (pauerbuf_t bp) | 706 | static void auerbuf_free (pauerbuf_t bp) |
707 | { | 707 | { |
708 | if (bp->bufp) { | 708 | kfree(bp->bufp); |
709 | kfree (bp->bufp); | 709 | kfree(bp->dr); |
710 | } | ||
711 | if (bp->dr) { | ||
712 | kfree (bp->dr); | ||
713 | } | ||
714 | if (bp->urbp) { | 710 | if (bp->urbp) { |
715 | usb_free_urb (bp->urbp); | 711 | usb_free_urb(bp->urbp); |
716 | } | 712 | } |
717 | kfree (bp); | 713 | kfree(bp); |
718 | } | 714 | } |
719 | 715 | ||
720 | /* free the buffers from an auerbuf list */ | 716 | /* free the buffers from an auerbuf list */ |
@@ -1093,14 +1089,12 @@ exit: | |||
1093 | */ | 1089 | */ |
1094 | static void auerswald_int_free (pauerswald_t cp) | 1090 | static void auerswald_int_free (pauerswald_t cp) |
1095 | { | 1091 | { |
1096 | if (cp->inturbp) { | 1092 | if (cp->inturbp) { |
1097 | usb_free_urb (cp->inturbp); | 1093 | usb_free_urb(cp->inturbp); |
1098 | cp->inturbp = NULL; | 1094 | cp->inturbp = NULL; |
1099 | } | 1095 | } |
1100 | if (cp->intbufp) { | 1096 | kfree(cp->intbufp); |
1101 | kfree (cp->intbufp); | 1097 | cp->intbufp = NULL; |
1102 | cp->intbufp = NULL; | ||
1103 | } | ||
1104 | } | 1098 | } |
1105 | 1099 | ||
1106 | /* This function is called to activate the interrupt | 1100 | /* This function is called to activate the interrupt |