From 15ee6fbe4b1fb501eba88d5356ae73165d7c78e8 Mon Sep 17 00:00:00 2001 From: Matthew Dharm Date: Mon, 24 Mar 2003 21:49:07 -0800 Subject: [PATCH] [PATCH] usb-storage: cleanup 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. --- drivers/usb/storage/usb.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c index 4c2b6de50c913..aa0b5ec968bc6 100644 --- a/drivers/usb/storage/usb.c +++ b/drivers/usb/storage/usb.c @@ -360,7 +360,7 @@ static int usb_stor_control_thread(void * __us) } 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 int usb_stor_allocate_urbs(struct us_data *ss) */ 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 @@ static void usb_stor_deallocate_urbs(struct us_data *ss) /* 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; } -- 2.53.0