aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/fdomain.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/fdomain.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/fdomain.c')
-rw-r--r--drivers/scsi/fdomain.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/scsi/fdomain.c b/drivers/scsi/fdomain.c
index a843c080c1d8..4ba6a15cf43d 100644
--- a/drivers/scsi/fdomain.c
+++ b/drivers/scsi/fdomain.c
@@ -1543,12 +1543,18 @@ static int fdomain_16x0_abort(struct scsi_cmnd *SCpnt)
1543 1543
1544int fdomain_16x0_bus_reset(struct scsi_cmnd *SCpnt) 1544int fdomain_16x0_bus_reset(struct scsi_cmnd *SCpnt)
1545{ 1545{
1546 unsigned long flags;
1547
1548 local_irq_save(flags);
1549
1546 outb(1, port_base + SCSI_Cntl); 1550 outb(1, port_base + SCSI_Cntl);
1547 do_pause( 2 ); 1551 do_pause( 2 );
1548 outb(0, port_base + SCSI_Cntl); 1552 outb(0, port_base + SCSI_Cntl);
1549 do_pause( 115 ); 1553 do_pause( 115 );
1550 outb(0, port_base + SCSI_Mode_Cntl); 1554 outb(0, port_base + SCSI_Mode_Cntl);
1551 outb(PARITY_MASK, port_base + TMC_Cntl); 1555 outb(PARITY_MASK, port_base + TMC_Cntl);
1556
1557 local_irq_restore(flags);
1552 return SUCCESS; 1558 return SUCCESS;
1553} 1559}
1554 1560