--- linux/drivers/scsi/scsi.c-stock	Fri Oct 25 15:41:03 2002
+++ linux/drivers/scsi/scsi.c	Fri Oct 25 15:47:04 2002
@@ -2672,10 +2672,10 @@
         SDpnt->type = -1;
         SDpnt->queue_depth = 1;
         
-	scsi_build_commandblocks(SDpnt);
-
 	scsi_initialize_queue(SDpnt, SHpnt);
 
+	scsi_build_commandblocks(SDpnt);
+
 	SDpnt->online = TRUE;
 
         /*
@@ -2705,13 +2705,12 @@
                 panic("Attempt to delete wrong device\n");
         }
 
-        blk_cleanup_queue(&SDpnt->request_queue);
-
         /*
          * We only have a single SCpnt attached to this device.  Free
          * it now.
          */
 	scsi_release_commandblocks(SDpnt);
+        blk_cleanup_queue(&SDpnt->request_queue);
         kfree(SDpnt);
 }