diff options
Diffstat (limited to 'drivers/ata/sata_nv.c')
-rw-r--r-- | drivers/ata/sata_nv.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c index 783281ec28c6..30eed12b3631 100644 --- a/drivers/ata/sata_nv.c +++ b/drivers/ata/sata_nv.c | |||
@@ -669,18 +669,18 @@ static unsigned int nv_adma_tf_to_cpb(struct ata_taskfile *tf, __le16 *cpb) | |||
669 | cpb[idx++] = cpu_to_le16((ATA_REG_ERR << 8) | tf->feature); | 669 | cpb[idx++] = cpu_to_le16((ATA_REG_ERR << 8) | tf->feature); |
670 | } else | 670 | } else |
671 | cpb[idx++] = cpu_to_le16((ATA_REG_ERR << 8) | tf->feature | WNB); | 671 | cpb[idx++] = cpu_to_le16((ATA_REG_ERR << 8) | tf->feature | WNB); |
672 | 672 | ||
673 | cpb[idx++] = cpu_to_le16((ATA_REG_NSECT << 8) | tf->nsect); | 673 | cpb[idx++] = cpu_to_le16((ATA_REG_NSECT << 8) | tf->nsect); |
674 | cpb[idx++] = cpu_to_le16((ATA_REG_LBAL << 8) | tf->lbal); | 674 | cpb[idx++] = cpu_to_le16((ATA_REG_LBAL << 8) | tf->lbal); |
675 | cpb[idx++] = cpu_to_le16((ATA_REG_LBAM << 8) | tf->lbam); | 675 | cpb[idx++] = cpu_to_le16((ATA_REG_LBAM << 8) | tf->lbam); |
676 | cpb[idx++] = cpu_to_le16((ATA_REG_LBAH << 8) | tf->lbah); | 676 | cpb[idx++] = cpu_to_le16((ATA_REG_LBAH << 8) | tf->lbah); |
677 | } | 677 | } |
678 | 678 | ||
679 | if(tf->flags & ATA_TFLAG_DEVICE) | 679 | if(tf->flags & ATA_TFLAG_DEVICE) |
680 | cpb[idx++] = cpu_to_le16((ATA_REG_DEVICE << 8) | tf->device); | 680 | cpb[idx++] = cpu_to_le16((ATA_REG_DEVICE << 8) | tf->device); |
681 | 681 | ||
682 | cpb[idx++] = cpu_to_le16((ATA_REG_CMD << 8) | tf->command | CMDEND); | 682 | cpb[idx++] = cpu_to_le16((ATA_REG_CMD << 8) | tf->command | CMDEND); |
683 | 683 | ||
684 | while(idx < 12) | 684 | while(idx < 12) |
685 | cpb[idx++] = cpu_to_le16(IGN); | 685 | cpb[idx++] = cpu_to_le16(IGN); |
686 | 686 | ||
@@ -1402,7 +1402,7 @@ static void nv_adma_error_handler(struct ata_port *ap) | |||
1402 | void __iomem *mmio = pp->ctl_block; | 1402 | void __iomem *mmio = pp->ctl_block; |
1403 | int i; | 1403 | int i; |
1404 | u16 tmp; | 1404 | u16 tmp; |
1405 | 1405 | ||
1406 | if(ata_tag_valid(ap->active_tag) || ap->sactive) { | 1406 | if(ata_tag_valid(ap->active_tag) || ap->sactive) { |
1407 | u32 notifier = readl(mmio + NV_ADMA_NOTIFIER); | 1407 | u32 notifier = readl(mmio + NV_ADMA_NOTIFIER); |
1408 | u32 notifier_error = readl(mmio + NV_ADMA_NOTIFIER_ERROR); | 1408 | u32 notifier_error = readl(mmio + NV_ADMA_NOTIFIER_ERROR); |