diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-10 13:09:37 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-10 13:09:37 +0100 |
| commit | ca7d5e42d783e54f0057317c9226262d68ab7717 (patch) | |
| tree | 209751546842e1200bfbd2fd5144e1727ab18c86 /drivers/scsi/sata_mv.c | |
| parent | Merge branch 'upstream' (diff) | |
| parent | [PATCH] ahci: separate out ahci_fill_cmd_slot() (diff) | |
| download | linux-ca7d5e42d783e54f0057317c9226262d68ab7717.tar.xz linux-ca7d5e42d783e54f0057317c9226262d68ab7717.zip | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/scsi/sata_mv.c')
| -rw-r--r-- | drivers/scsi/sata_mv.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c index 5b36a23455de..cda4c495c10f 100644 --- a/drivers/scsi/sata_mv.c +++ b/drivers/scsi/sata_mv.c @@ -378,6 +378,7 @@ static struct scsi_host_template mv_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 = MV_USE_Q_DEPTH, .this_id = ATA_SHT_THIS_ID, @@ -2025,13 +2026,8 @@ static void mv_eng_timeout(struct ata_port *ap) mv_err_intr(ap); mv_stop_and_reset(ap); - if (!qc) { - printk(KERN_ERR "ata%u: BUG: timeout without command\n", - ap->id); - } else { - qc->err_mask |= AC_ERR_TIMEOUT; - ata_eh_qc_complete(qc); - } + qc->err_mask |= AC_ERR_TIMEOUT; + ata_eh_qc_complete(qc); } /** |