net: ntohs() misuse

[safe/jmp/linux-2.6] / drivers / ide / ide-acpi.c

diff --git a/drivers/ide/ide-acpi.c b/drivers/ide/ide-acpi.c
index 5b704f1..77f79d2 100644 (file)
--- a/drivers/ide/ide-acpi.c
+++ b/drivers/ide/ide-acpi.c
@@ -304,7 +304,7 @@ static int do_drive_set_taskfiles(ide_drive_t *drive,
        /* send all taskfile registers (0x1f1-0x1f7) *in*that*order* */
        for (ix = 0; ix < gtf_count; ix++) {
                u8 *gtf = (u8 *)(gtf_address + ix * REGS_PER_GTF);
-               ide_task_t task;
+               struct ide_cmd cmd;
 
                DEBPRINT("(0x1f1-1f7): "
                         "hex: %02x %02x %02x %02x %02x %02x %02x\n",
@@ -317,11 +317,12 @@ static int do_drive_set_taskfiles(ide_drive_t *drive,
                }
 
                /* convert GTF to taskfile */
-               memset(&task, 0, sizeof(ide_task_t));
-               memcpy(&task.tf_array[7], gtf, REGS_PER_GTF);
-               task.tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE;
+               memset(&cmd, 0, sizeof(cmd));
+               memcpy(&cmd.tf.feature, gtf, REGS_PER_GTF);
+               cmd.valid.out.tf = IDE_VALID_OUT_TF | IDE_VALID_DEVICE;
+               cmd.valid.in.tf  = IDE_VALID_IN_TF  | IDE_VALID_DEVICE;
 
-               err = ide_no_data_taskfile(drive, &task);
+               err = ide_no_data_taskfile(drive, &cmd);
                if (err) {
                        printk(KERN_ERR "%s: ide_no_data_taskfile failed: %u\n",
                                        __func__, err);