diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-10 07:09:37 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-10 07:09:37 -0500 |
| commit | ca7d5e42d783e54f0057317c9226262d68ab7717 (patch) | |
| tree | 209751546842e1200bfbd2fd5144e1727ab18c86 /drivers/scsi/sata_promise.c | |
| parent | a0819750024a0056d760a936d72f76882a7e393f (diff) | |
| parent | cc9278ed5e992122a654a3f762561ee5e013810f (diff) | |
| download | linux-ca7d5e42d783e54f0057317c9226262d68ab7717.tar.gz linux-ca7d5e42d783e54f0057317c9226262d68ab7717.tar.bz2 linux-ca7d5e42d783e54f0057317c9226262d68ab7717.zip | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/scsi/sata_promise.c')
| -rw-r--r-- | drivers/scsi/sata_promise.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c index dcd1667f4144..a88b563ebcc4 100644 --- a/drivers/scsi/sata_promise.c +++ b/drivers/scsi/sata_promise.c @@ -112,6 +112,7 @@ static struct scsi_host_template pdc_ata_sht = { .name = DRV_NAME, .ioctl = ata_scsi_ioctl, .queuecommand = ata_scsi_queuecmd, + .eh_timed_out = ata_scsi_timed_out, .eh_strategy_handler = ata_scsi_error, .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, @@ -432,11 +433,6 @@ static void pdc_eng_timeout(struct ata_port *ap) spin_lock_irqsave(&host_set->lock, flags); qc = ata_qc_from_tag(ap, ap->active_tag); - if (!qc) { - printk(KERN_ERR "ata%u: BUG: timeout without command\n", - ap->id); - goto out; - } switch (qc->tf.protocol) { case ATA_PROT_DMA: @@ -456,10 +452,8 @@ static void pdc_eng_timeout(struct ata_port *ap) break; } -out: spin_unlock_irqrestore(&host_set->lock, flags); - if (qc) - ata_eh_qc_complete(qc); + ata_eh_qc_complete(qc); DPRINTK("EXIT\n"); } |