aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/aha1542.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-05-28 07:56:31 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-06-17 13:05:10 -0400
commit68b3aa7c9805aee9005a8ca53c5e99177961fbb9 (patch)
tree3f28891df0b3a1ecdfe6a98547d8f3c43b74e905 /drivers/scsi/aha1542.c
parent94d0e7b805961c44e4dc486ffc21075084bb7175 (diff)
[SCSI] allow sleeping in ->eh_bus_reset_handler()
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/aha1542.c')
-rw-r--r--drivers/scsi/aha1542.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/scsi/aha1542.c b/drivers/scsi/aha1542.c
index eb8bc6822cc1..f911b51e3042 100644
--- a/drivers/scsi/aha1542.c
+++ b/drivers/scsi/aha1542.c
@@ -1464,8 +1464,8 @@ static int aha1542_bus_reset(Scsi_Cmnd * SCpnt)
1464 * check for timeout, and if we are doing something like this 1464 * check for timeout, and if we are doing something like this
1465 * we are pretty desperate anyways. 1465 * we are pretty desperate anyways.
1466 */ 1466 */
1467 spin_unlock_irq(SCpnt->device->host->host_lock);
1468 ssleep(4); 1467 ssleep(4);
1468
1469 spin_lock_irq(SCpnt->device->host->host_lock); 1469 spin_lock_irq(SCpnt->device->host->host_lock);
1470 1470
1471 WAIT(STATUS(SCpnt->device->host->io_port), 1471 WAIT(STATUS(SCpnt->device->host->io_port),
@@ -1503,9 +1503,11 @@ static int aha1542_bus_reset(Scsi_Cmnd * SCpnt)
1503 } 1503 }
1504 } 1504 }
1505 1505
1506 spin_unlock_irq(SCpnt->device->host->host_lock);
1506 return SUCCESS; 1507 return SUCCESS;
1507 1508
1508fail: 1509fail:
1510 spin_unlock_irq(SCpnt->device->host->host_lock);
1509 return FAILED; 1511 return FAILED;
1510} 1512}
1511 1513