[PATCH] scsi host / scsi device ref counting take 2 [2/3]

[Mike Anderson <andmike@us.ibm.com>]

-andmike
--
Michael Anderson
andmike@us.ibm.com


DESC
Align usb storage shutdown with changes in the shost shutdown.
EDESC


 drivers/usb/storage/usb.c |   14 +-------------
 1 files changed, 1 insertion(+), 13 deletions(-)

diff -puN drivers/usb/storage/usb.c~usb_stor_fixups drivers/usb/storage/usb.c
--- patched-scsi-misc-2.5/drivers/usb/storage/usb.c~usb_stor_fixups	Fri Aug  1 07:07:17 2003
+++ patched-scsi-misc-2.5-andmike/drivers/usb/storage/usb.c	Fri Aug  1 07:07:17 2003
@@ -978,16 +978,9 @@ BadDevice:
 static void storage_disconnect(struct usb_interface *intf)
 {
 	struct us_data *us = usb_get_intfdata(intf);
-	struct scsi_device *sdev;
 
 	US_DEBUGP("storage_disconnect() called\n");
 
-	/* Set devices offline -- need host lock for this */
-	scsi_lock(us->host);
-	list_for_each_entry(sdev, &us->host->my_devices, siblings)
-		sdev->online = 0;
-	scsi_unlock(us->host);
-
 	/* Prevent new USB transfers and stop the current command */
 	set_bit(US_FLIDX_DISCONNECTING, &us->flags);
 	usb_stor_stop_transport(us);
@@ -995,12 +988,7 @@ static void storage_disconnect(struct us
 	/* Dissociate from the USB device */
 	dissociate_dev(us);
 
-	/* Begin the SCSI host removal sequence */
-	if (scsi_remove_host(us->host)) {
-		US_DEBUGP("-- SCSI refused to remove the host\n");
-		BUG();
-		return;
-	}
+	scsi_remove_host(us->host);
 
 	/* TODO: somehow, wait for the device to
 	 * be 'idle' (tasklet completion) */

_