diff options
author | Tejun Heo <htejun@gmail.com> | 2006-02-10 01:10:48 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-10 06:50:47 -0500 |
commit | f63790201521ccadb63673ff121dac46ab300cf0 (patch) | |
tree | 86781b4efc31f9005c17de63df2606c35ae3b0c0 /drivers/scsi/sata_sil24.c | |
parent | 35daeb8f9b41fd13180e8a6f8bec9fc5268938f9 (diff) |
[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/sata_sil24.c')
-rw-r--r-- | drivers/scsi/sata_sil24.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/scsi/sata_sil24.c b/drivers/scsi/sata_sil24.c index f4742ad3c962..962396b36f61 100644 --- a/drivers/scsi/sata_sil24.c +++ b/drivers/scsi/sata_sil24.c | |||
@@ -639,11 +639,6 @@ static void sil24_eng_timeout(struct ata_port *ap) | |||
639 | struct ata_queued_cmd *qc; | 639 | struct ata_queued_cmd *qc; |
640 | 640 | ||
641 | qc = ata_qc_from_tag(ap, ap->active_tag); | 641 | qc = ata_qc_from_tag(ap, ap->active_tag); |
642 | if (!qc) { | ||
643 | printk(KERN_ERR "ata%u: BUG: timeout without command\n", | ||
644 | ap->id); | ||
645 | return; | ||
646 | } | ||
647 | 642 | ||
648 | printk(KERN_ERR "ata%u: command timeout\n", ap->id); | 643 | printk(KERN_ERR "ata%u: command timeout\n", ap->id); |
649 | qc->err_mask |= AC_ERR_TIMEOUT; | 644 | qc->err_mask |= AC_ERR_TIMEOUT; |