summaryrefslogtreecommitdiffstats
path: root/drivers/ata/libata-core.c
diff options
context:
space:
mode:
authorMarc Carino <marc.ceeeee@gmail.com>2013-09-01 17:59:01 +0200
committerTejun Heo <tj@kernel.org>2013-09-03 16:37:41 +0200
commit86a565e61bcb9574bae3b622799682fef2d855bb (patch)
tree7e6b44cba78f54779388ebb1c6a1b78138cb5807 /drivers/ata/libata-core.c
parentlibata: acpi: Remove ata_dev_acpi_handle stub in libata.h (diff)
downloadlinux-86a565e61bcb9574bae3b622799682fef2d855bb.tar.xz
linux-86a565e61bcb9574bae3b622799682fef2d855bb.zip
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 <marc.ceeeee@gmail.com> Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/ata/libata-core.c')
-rw-r--r--drivers/ata/libata-core.c10
1 files 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;
}
/**