diff options
Diffstat (limited to 'drivers/scsi/ncr53c8xx.c')
-rw-r--r-- | drivers/scsi/ncr53c8xx.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/scsi/ncr53c8xx.c b/drivers/scsi/ncr53c8xx.c index 7ae13236788e..2a0e42ec27d3 100644 --- a/drivers/scsi/ncr53c8xx.c +++ b/drivers/scsi/ncr53c8xx.c | |||
@@ -7486,24 +7486,14 @@ static int ncr53c8xx_abort(struct scsi_cmnd *cmd) | |||
7486 | struct scsi_cmnd *done_list; | 7486 | struct scsi_cmnd *done_list; |
7487 | 7487 | ||
7488 | #if defined SCSI_RESET_SYNCHRONOUS && defined SCSI_RESET_ASYNCHRONOUS | 7488 | #if defined SCSI_RESET_SYNCHRONOUS && defined SCSI_RESET_ASYNCHRONOUS |
7489 | printk("ncr53c8xx_abort: pid=%lu serial_number=%ld serial_number_at_timeout=%ld\n", | 7489 | printk("ncr53c8xx_abort: pid=%lu serial_number=%ld\n", |
7490 | cmd->pid, cmd->serial_number, cmd->serial_number_at_timeout); | 7490 | cmd->pid, cmd->serial_number); |
7491 | #else | 7491 | #else |
7492 | printk("ncr53c8xx_abort: command pid %lu\n", cmd->pid); | 7492 | printk("ncr53c8xx_abort: command pid %lu\n", cmd->pid); |
7493 | #endif | 7493 | #endif |
7494 | 7494 | ||
7495 | NCR_LOCK_NCB(np, flags); | 7495 | NCR_LOCK_NCB(np, flags); |
7496 | 7496 | ||
7497 | #if defined SCSI_RESET_SYNCHRONOUS && defined SCSI_RESET_ASYNCHRONOUS | ||
7498 | /* | ||
7499 | * We have to just ignore abort requests in some situations. | ||
7500 | */ | ||
7501 | if (cmd->serial_number != cmd->serial_number_at_timeout) { | ||
7502 | sts = SCSI_ABORT_NOT_RUNNING; | ||
7503 | goto out; | ||
7504 | } | ||
7505 | #endif | ||
7506 | |||
7507 | sts = ncr_abort_command(np, cmd); | 7497 | sts = ncr_abort_command(np, cmd); |
7508 | out: | 7498 | out: |
7509 | done_list = np->done_list; | 7499 | done_list = np->done_list; |