Merge branch 'upstream'

Conflicts:

	drivers/scsi/sata_vsc.c

1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c
index 692c63bdcff8..2819a75c4a84 100644
--- a/drivers/scsi/sata_mv.c
+++ b/drivers/scsi/sata_mv.c
@@ -378,7 +378,6 @@ 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,
@@ -1263,6 +1262,7 @@ static u8 mv_get_crpb_status(struct ata_port *ap)
         void __iomem *port_mmio = mv_ap_base(ap);
         struct mv_port_priv *pp = ap->private_data;
         u32 out_ptr;
+        u8 ata_status;
 
         out_ptr = readl(port_mmio + EDMA_RSP_Q_OUT_PTR_OFS);
 
@@ -1270,6 +1270,8 @@ static u8 mv_get_crpb_status(struct ata_port *ap)
         WARN_ON(((out_ptr >> EDMA_RSP_Q_PTR_SHIFT) & MV_MAX_Q_DEPTH_MASK) !=
                 pp->rsp_consumer);
 
+        ata_status = pp->crpb[pp->rsp_consumer].flags >> CRPB_FLAG_STATUS_SHIFT;
+
         /* increment our consumer index... */
         pp->rsp_consumer = mv_inc_q_index(&pp->rsp_consumer);
 
@@ -1284,7 +1286,7 @@ static u8 mv_get_crpb_status(struct ata_port *ap)
         writelfl(out_ptr, port_mmio + EDMA_RSP_Q_OUT_PTR_OFS);
 
         /* Return ATA status register for completed CRPB */
-        return (pp->crpb[pp->rsp_consumer].flags >> CRPB_FLAG_STATUS_SHIFT);
+        return ata_status;
 }
 
 /**
@@ -1353,7 +1355,6 @@ static void mv_host_intr(struct ata_host_set *host_set, u32 relevant,
         u32 hc_irq_cause;
         int shift, port, port0, hard_port, handled;
         unsigned int err_mask;
-        u8 ata_status = 0;
 
         if (hc == 0) {
                 port0 = 0;
@@ -1371,6 +1372,7 @@ static void mv_host_intr(struct ata_host_set *host_set, u32 relevant,
                 hc,relevant,hc_irq_cause);
 
         for (port = port0; port < port0 + MV_PORTS_PER_HC; port++) {
+                u8 ata_status = 0;
                 ap = host_set->ports[port];
                 hard_port = port & MV_PORT_MASK;        /* range 0-3 */
                 handled = 0;    /* ensure ata_status is set if handled++ */