diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-05-28 07:56:31 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-17 13:05:10 -0400 |
commit | 68b3aa7c9805aee9005a8ca53c5e99177961fbb9 (patch) | |
tree | 3f28891df0b3a1ecdfe6a98547d8f3c43b74e905 /drivers/usb | |
parent | 94d0e7b805961c44e4dc486ffc21075084bb7175 (diff) |
[SCSI] allow sleeping in ->eh_bus_reset_handler()
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/storage/scsiglue.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c index 739a9143477d..1035b248eff4 100644 --- a/drivers/usb/storage/scsiglue.c +++ b/drivers/usb/storage/scsiglue.c | |||
@@ -276,8 +276,6 @@ static int bus_reset(struct scsi_cmnd *srb) | |||
276 | 276 | ||
277 | US_DEBUGP("%s called\n", __FUNCTION__); | 277 | US_DEBUGP("%s called\n", __FUNCTION__); |
278 | 278 | ||
279 | scsi_unlock(us_to_host(us)); | ||
280 | |||
281 | /* The USB subsystem doesn't handle synchronisation between | 279 | /* The USB subsystem doesn't handle synchronisation between |
282 | * a device's several drivers. Therefore we reset only devices | 280 | * a device's several drivers. Therefore we reset only devices |
283 | * with just one interface, which we of course own. */ | 281 | * with just one interface, which we of course own. */ |
@@ -304,7 +302,6 @@ static int bus_reset(struct scsi_cmnd *srb) | |||
304 | up(&(us->dev_semaphore)); | 302 | up(&(us->dev_semaphore)); |
305 | 303 | ||
306 | /* lock the host for the return */ | 304 | /* lock the host for the return */ |
307 | scsi_lock(us_to_host(us)); | ||
308 | return result < 0 ? FAILED : SUCCESS; | 305 | return result < 0 ? FAILED : SUCCESS; |
309 | } | 306 | } |
310 | 307 | ||