diff options
| author | Tejun Heo | 2006-02-10 07:10:48 +0100 |
|---|---|---|
| committer | Jeff Garzik | 2006-02-10 12:50:47 +0100 |
| commit | f63790201521ccadb63673ff121dac46ab300cf0 (patch) | |
| tree | 86781b4efc31f9005c17de63df2606c35ae3b0c0 /drivers/scsi/libata-core.c | |
| parent | [PATCH] libata: use ata_scsi_timed_out() (diff) | |
| download | kernel-qcow2-linux-f63790201521ccadb63673ff121dac46ab300cf0.tar.gz kernel-qcow2-linux-f63790201521ccadb63673ff121dac46ab300cf0.tar.xz kernel-qcow2-linux-f63790201521ccadb63673ff121dac46ab300cf0.zip | |
[PATCH] libata: kill NULL qc handling from ->eng_timeout callbacks
->eng_timeout cannot be invoked with NULL qc anymore. Add an
assertion in ata_scsi_error() and kill NULL qc handling from all
->eng_timeout callbacks.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/scsi/libata-core.c')
| -rw-r--r-- | drivers/scsi/libata-core.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c index d53e0bce2bec..b938c7a37664 100644 --- a/drivers/scsi/libata-core.c +++ b/drivers/scsi/libata-core.c @@ -3524,20 +3524,10 @@ static void ata_qc_timeout(struct ata_queued_cmd *qc) void ata_eng_timeout(struct ata_port *ap) { - struct ata_queued_cmd *qc; - DPRINTK("ENTER\n"); - qc = ata_qc_from_tag(ap, ap->active_tag); - if (qc) - ata_qc_timeout(qc); - else { - printk(KERN_ERR "ata%u: BUG: timeout without command\n", - ap->id); - goto out; - } + ata_qc_timeout(ata_qc_from_tag(ap, ap->active_tag)); -out: DPRINTK("EXIT\n"); } |