[PATCH] USB: move the usb hcd code to use the new class code.

[linux-2.6] / drivers / usb / storage / scsiglue.c

diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c
index 7dce9c01c357b878a4266f90e0dd0f3460809b16..1035b248eff4c7175bbf0f15d1ed649c2aad7e03 100644 (file)
--- a/drivers/usb/storage/scsiglue.c
+++ b/drivers/usb/storage/scsiglue.c
@@ -253,8 +253,6 @@ static int device_reset(struct scsi_cmnd *srb)
 
        US_DEBUGP("%s called\n", __FUNCTION__);
 
-       scsi_unlock(us_to_host(us));
-
        /* lock the device pointers and do the reset */
        down(&(us->dev_semaphore));
        if (test_bit(US_FLIDX_DISCONNECTING, &us->flags)) {
@@ -264,8 +262,6 @@ static int device_reset(struct scsi_cmnd *srb)
                result = us->transport_reset(us);
        up(&(us->dev_semaphore));
 
-       /* lock the host for the return */
-       scsi_lock(us_to_host(us));
        return result;
 }
 
@@ -280,8 +276,6 @@ static int bus_reset(struct scsi_cmnd *srb)
 
        US_DEBUGP("%s called\n", __FUNCTION__);
 
-       scsi_unlock(us_to_host(us));
-
        /* The USB subsystem doesn't handle synchronisation between
         * a device's several drivers. Therefore we reset only devices
         * with just one interface, which we of course own. */
@@ -308,7 +302,6 @@ static int bus_reset(struct scsi_cmnd *srb)
        up(&(us->dev_semaphore));
 
        /* lock the host for the return */
-       scsi_lock(us_to_host(us));
        return result < 0 ? FAILED : SUCCESS;
 }