Merge branch 'upstream'

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);
 }
 
 /**