Skip to content

Commit

Permalink
libata: bugfix: Remove __le32 in ata_tf_to_fis()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Marc Carino authored and Tejun Heo committed Sep 3, 2013
1 parent 03f7b80 commit 86a565e
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions drivers/ata/libata-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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;
}

/**
Expand Down

0 comments on commit 86a565e

Please sign in to comment.