Merge tag '5.20-rc-ksmbd-server-fixes' of git://git.samba.org/ksmbd

[linux-2.6-microblaze.git] / drivers / ata / sata_svw.c

diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c
index f855255..2e3418a 100644 (file)
--- a/drivers/ata/sata_svw.c
+++ b/drivers/ata/sata_svw.c
@@ -194,24 +194,24 @@ static void k2_sata_tf_load(struct ata_port *ap, const struct ata_taskfile *tf)
 static void k2_sata_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
 {
        struct ata_ioports *ioaddr = &ap->ioaddr;
-       u16 nsect, lbal, lbam, lbah, feature;
+       u16 nsect, lbal, lbam, lbah, error;
 
-       tf->command = k2_stat_check_status(ap);
+       tf->status = k2_stat_check_status(ap);
        tf->device = readw(ioaddr->device_addr);
-       feature = readw(ioaddr->error_addr);
+       error = readw(ioaddr->error_addr);
        nsect = readw(ioaddr->nsect_addr);
        lbal = readw(ioaddr->lbal_addr);
        lbam = readw(ioaddr->lbam_addr);
        lbah = readw(ioaddr->lbah_addr);
 
-       tf->feature = feature;
+       tf->error = error;
        tf->nsect = nsect;
        tf->lbal = lbal;
        tf->lbam = lbam;
        tf->lbah = lbah;
 
        if (tf->flags & ATA_TFLAG_LBA48) {
-               tf->hob_feature = feature >> 8;
+               tf->hob_feature = error >> 8;
                tf->hob_nsect = nsect >> 8;
                tf->hob_lbal = lbal >> 8;
                tf->hob_lbam = lbam >> 8;