From 86a565e61bcb9574bae3b622799682fef2d855bb Mon Sep 17 00:00:00 2001 From: Marc Carino Date: Sun, 1 Sep 2013 08:59:01 -0700 Subject: [PATCH] libata: bugfix: Remove __le32 in ata_tf_to_fis() The endianness attribute on the 'aux' local variable is wrong, and can lead to wrong endianness on big-endian machines, Signed-off-by: Marc Carino Signed-off-by: Tejun Heo --- drivers/ata/libata-core.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index a044be99841a..83b1a9fb2d44 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -546,8 +546,6 @@ int atapi_cmd_type(u8 opcode) */ void ata_tf_to_fis(const struct ata_taskfile *tf, u8 pmp, int is_cmd, u8 *fis) { - const __le32 aux = cpu_to_le32(tf->auxiliary); - fis[0] = 0x27; /* Register - Host to Device FIS */ fis[1] = pmp & 0xf; /* Port multiplier number*/ if (is_cmd) @@ -571,10 +569,10 @@ void ata_tf_to_fis(const struct ata_taskfile *tf, u8 pmp, int is_cmd, u8 *fis) fis[14] = 0; fis[15] = tf->ctl; - fis[16] = aux & 0xff; - fis[17] = (aux >> 8) & 0xff; - fis[18] = (aux >> 16) & 0xff; - fis[19] = (aux >> 24) & 0xff; + fis[16] = tf->auxiliary & 0xff; + fis[17] = (tf->auxiliary >> 8) & 0xff; + fis[18] = (tf->auxiliary >> 16) & 0xff; + fis[19] = (tf->auxiliary >> 24) & 0xff; } /** -- 2.39.5