diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-05-28 07:55:48 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-17 13:05:03 -0400 |
commit | 94d0e7b805961c44e4dc486ffc21075084bb7175 (patch) | |
tree | 1609752ea7a9adb28583147f0bea33a9f10877d7 /drivers/usb/storage | |
parent | 8fa728a26886f56a9ee10a44fea0ddda301d21c3 (diff) |
[SCSI] allow sleeping in ->eh_device_reset_handler()
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/usb/storage')
-rw-r--r-- | drivers/usb/storage/scsiglue.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c index 7dce9c01c357..739a9143477d 100644 --- a/drivers/usb/storage/scsiglue.c +++ b/drivers/usb/storage/scsiglue.c | |||
@@ -253,8 +253,6 @@ static int device_reset(struct scsi_cmnd *srb) | |||
253 | 253 | ||
254 | US_DEBUGP("%s called\n", __FUNCTION__); | 254 | US_DEBUGP("%s called\n", __FUNCTION__); |
255 | 255 | ||
256 | scsi_unlock(us_to_host(us)); | ||
257 | |||
258 | /* lock the device pointers and do the reset */ | 256 | /* lock the device pointers and do the reset */ |
259 | down(&(us->dev_semaphore)); | 257 | down(&(us->dev_semaphore)); |
260 | if (test_bit(US_FLIDX_DISCONNECTING, &us->flags)) { | 258 | if (test_bit(US_FLIDX_DISCONNECTING, &us->flags)) { |
@@ -264,8 +262,6 @@ static int device_reset(struct scsi_cmnd *srb) | |||
264 | result = us->transport_reset(us); | 262 | result = us->transport_reset(us); |
265 | up(&(us->dev_semaphore)); | 263 | up(&(us->dev_semaphore)); |
266 | 264 | ||
267 | /* lock the host for the return */ | ||
268 | scsi_lock(us_to_host(us)); | ||
269 | return result; | 265 | return result; |
270 | } | 266 | } |
271 | 267 | ||