This patch changes some debugging output to be a bit more clear, and removes some un-needed code -- it's no longer possible for us to have active URBs in the disconnect path.
Greg, please apply.
Matt
# This is a BitKeeper generated patch for the following project:
# Project Name: greg k-h's linux 2.5 USB kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.699 -> 1.700
# drivers/usb/storage/usb.c 1.78 -> 1.79
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/03/23 [EMAIL PROTECTED] 1.700
# Change debugging print to be more clear. Remove un-necessary unlink of an
# URB that can't possibly be submitted.
# --------------------------------------------
#
diff -Nru a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
--- a/drivers/usb/storage/usb.c Sun Mar 23 11:53:04 2003
+++ b/drivers/usb/storage/usb.c Sun Mar 23 11:53:04 2003
@@ -360,7 +360,7 @@
}
else if (us->srb->device->lun > us->max_lun) {
- US_DEBUGP("Bad LUN (%d/%d)\n",
+ US_DEBUGP("Bad LUN (%d:%d)\n",
us->srb->device->id, us->srb->device->lun);
us->srb->result = DID_BAD_TARGET << 16;
}
@@ -475,8 +475,6 @@
*/
static void usb_stor_deallocate_urbs(struct us_data *ss)
{
- int result;
-
/* free the scatter-gather request block */
if (ss->current_sg) {
kfree(ss->current_sg);
@@ -486,8 +484,6 @@
/* free up the main URB for this device */
if (ss->current_urb) {
US_DEBUGP("-- releasing main URB\n");
- result = usb_unlink_urb(ss->current_urb);
- US_DEBUGP("-- usb_unlink_urb() returned %d\n", result);
usb_free_urb(ss->current_urb);
ss->current_urb = NULL;
}
--
Matthew Dharm Home: [EMAIL PROTECTED]
Maintainer, Linux USB Mass Storage Driver
Hey Chief. We've figured out how to save the technical department. We
need to be committed.
-- The Techs
User Friendly, 1/22/1998
pgp00000.pgp
Description: PGP signature
