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/scsi/ibmmca.c | |
| 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/scsi/ibmmca.c')
| -rw-r--r-- | drivers/scsi/ibmmca.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/drivers/scsi/ibmmca.c b/drivers/scsi/ibmmca.c index a3fdead..0018fb5 100644 --- a/drivers/scsi/ibmmca.c +++ b/drivers/scsi/ibmmca.c @@ -2118,7 +2118,7 @@ static int ibmmca_queuecommand(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *)) return 0; } -static int ibmmca_abort(Scsi_Cmnd * cmd) +static int __ibmmca_abort(Scsi_Cmnd * cmd) { /* Abort does not work, as the adapter never generates an interrupt on * whatever situation is simulated, even when really pending commands @@ -2225,6 +2225,18 @@ static int ibmmca_abort(Scsi_Cmnd * cmd) } } +static int ibmmca_abort(Scsi_Cmnd * cmd) +{ + struct Scsi_Host *shpnt = cmd->device->host; + int rc; + + spin_lock_irq(shpnt->host_lock); + rc = __ibmmca_abort(cmd); + spin_unlock_irq(shpnt->host_lock); + + return rc; +} + static int ibmmca_host_reset(Scsi_Cmnd * cmd) { struct Scsi_Host *shpnt; |
