diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-05-28 07:54:40 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-17 12:04:55 -0500 |
| commit | 8fa728a26886f56a9ee10a44fea0ddda301d21c3 (patch) | |
| tree | 105ead5c90057400abae0c8aa9e2b5ba1818c327 /drivers/usb/storage | |
| parent | 3471c288036bf0835a82d0b1bbce2002f6e68390 (diff) | |
| download | op-kernel-dev-8fa728a26886f56a9ee10a44fea0ddda301d21c3.zip op-kernel-dev-8fa728a26886f56a9ee10a44fea0ddda301d21c3.tar.gz | |
[SCSI] allow sleeping in ->eh_abort_handler()
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/usb/storage')
| -rw-r--r-- | drivers/usb/storage/scsiglue.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c index 22e48a2..7dce9c0 100644 --- a/drivers/usb/storage/scsiglue.c +++ b/drivers/usb/storage/scsiglue.c @@ -233,13 +233,11 @@ static int command_abort(struct scsi_cmnd *srb) set_bit(US_FLIDX_ABORTING, &us->flags); usb_stor_stop_transport(us); } - scsi_unlock(us_to_host(us)); /* Wait for the aborted command to finish */ wait_for_completion(&us->notify); /* Reacquire the lock and allow USB transfers to resume */ - scsi_lock(us_to_host(us)); clear_bit(US_FLIDX_ABORTING, &us->flags); clear_bit(US_FLIDX_TIMED_OUT, &us->flags); return SUCCESS; |
