diff options
| author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-22 13:10:49 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-22 13:10:49 -0400 |
| commit | 80bd6d7f5e0d872a0f5a151473d2a39d95d210a8 (patch) | |
| tree | b3a36048d6b7de88f7e906624ecb4b98816bb736 /drivers/scsi/scsi.c | |
| parent | 949d33e70f2c3e93bfe5265a50e40175b1ab1ec1 (diff) | |
| parent | 2a5a68b840cbab31baab2d9b2e1e6de3b289ae1e (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/scsi/scsi.c')
| -rw-r--r-- | drivers/scsi/scsi.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index 184bcaeaf812..5578ae9a9e45 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c | |||
| @@ -638,10 +638,12 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd) | |||
| 638 | } | 638 | } |
| 639 | spin_unlock_irqrestore(host->host_lock, flags); | 639 | spin_unlock_irqrestore(host->host_lock, flags); |
| 640 | if (rtn) { | 640 | if (rtn) { |
| 641 | atomic_inc(&cmd->device->iodone_cnt); | 641 | if (scsi_delete_timer(cmd)) { |
| 642 | scsi_queue_insert(cmd, | 642 | atomic_inc(&cmd->device->iodone_cnt); |
| 643 | (rtn == SCSI_MLQUEUE_DEVICE_BUSY) ? | 643 | scsi_queue_insert(cmd, |
| 644 | rtn : SCSI_MLQUEUE_HOST_BUSY); | 644 | (rtn == SCSI_MLQUEUE_DEVICE_BUSY) ? |
| 645 | rtn : SCSI_MLQUEUE_HOST_BUSY); | ||
| 646 | } | ||
| 645 | SCSI_LOG_MLQUEUE(3, | 647 | SCSI_LOG_MLQUEUE(3, |
| 646 | printk("queuecommand : request rejected\n")); | 648 | printk("queuecommand : request rejected\n")); |
| 647 | } | 649 | } |