Merge branch 'upstream'

diff --combined drivers/scsi/sata_mv.c
index 08665ea,181917a..670ef16
--- 1/drivers/scsi/sata_mv.c
--- 2/drivers/scsi/sata_mv.c
+++ b/drivers/scsi/sata_mv.c
@@@ -87,7 -87,7 +87,7 @@@ enum 
        MV_FLAG_IRQ_COALESCE    = (1 << 29),  /* IRQ coalescing capability */
        MV_COMMON_FLAGS         = (ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
                                   ATA_FLAG_SATA_RESET | ATA_FLAG_MMIO |
 -                                 ATA_FLAG_NO_ATAPI),
 +                                 ATA_FLAG_PIO_POLLING),
        MV_6XXX_FLAGS           = MV_FLAG_IRQ_COALESCE,
  
        CRQB_FLAG_READ          = (1 << 0),
@@@ -747,7 -747,7 +747,7 @@@ static void mv_dump_all_regs(void __iom
        mv_dump_mem(mmio_base+0xf00, 0x4);
        mv_dump_mem(mmio_base+0x1d00, 0x6c);
        for (hc = start_hc; hc < start_hc + num_hcs; hc++) {
-               hc_base = mv_hc_base(mmio_base, port >> MV_PORT_HC_SHIFT);
+               hc_base = mv_hc_base(mmio_base, hc);
                DPRINTK("HC regs (HC %i):\n", hc);
                mv_dump_mem(hc_base, 0x1c);
        }
@@@ -1396,7 -1396,7 +1396,7 @@@ static void mv_host_intr(struct ata_hos
                        }
                }
  
 -              if (ap->flags & (ATA_FLAG_DISABLED | ATA_FLAG_NOINTR))
 +              if (ap && (ap->flags & ATA_FLAG_DISABLED))
                        continue;
  
                err_mask = ac_err_mask(ata_status);
@@@ -1417,7 -1417,7 +1417,7 @@@
                                VPRINTK("port %u IRQ found for qc, "
                                        "ata_status 0x%x\n", port,ata_status);
                                /* mark qc status appropriately */
 -                              if (!(qc->tf.ctl & ATA_NIEN)) {
 +                              if (!(qc->tf.flags & ATA_TFLAG_POLLING)) {
                                        qc->err_mask |= err_mask;
                                        ata_qc_complete(qc);
                                }