This patch started life as as472 from Alan Stern, and has been rediffed against the current tip.
This patch simply removes some unnecessary NULL checking before kfree()
calls.
Greg, please apply.
Signed-off-by: Alan Stern <[EMAIL PROTECTED]>
Signed-off-by: Matthew Dharm <[EMAIL PROTECTED]>
Matt
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
# 2005/03/06 17:42:07-08:00 [EMAIL PROTECTED]
# as472
#
# drivers/usb/storage/usb.c
# 2005/03/06 17:41:46-08:00 [EMAIL PROTECTED] +2 -5
# as472
#
diff -Nru a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
--- a/drivers/usb/storage/usb.c 2005-03-13 21:34:20 -08:00
+++ b/drivers/usb/storage/usb.c 2005-03-13 21:34:20 -08:00
@@ -829,11 +829,8 @@
scsi_host_put(us->host);
/* Free the extra data and the URB */
- if (us->extra)
- kfree(us->extra);
- if (us->current_urb)
- usb_free_urb(us->current_urb);
-
+ kfree(us->extra);
+ usb_free_urb(us->current_urb);
}
/* Dissociate from the USB device */
--
Matthew Dharm Home: [EMAIL PROTECTED]
Maintainer, Linux USB Mass Storage Driver
P: How about "Web Designer"?
DP: I'd like a name that people won't laugh at.
-- Pitr and Dust Puppy
User Friendly, 12/6/1997
pgpdTMU2xEM7C.pgp
Description: PGP signature
