diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-31 14:14:57 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-31 14:14:57 -0400 |
commit | da19620d99377a52b953245089f831a9c3f049c2 (patch) | |
tree | e2c09abd8cd244eadfc000b4c6a7da37dfafa643 /drivers/ide/at91_ide.c | |
parent | 479edf065576aeed7ac99d10838bb3b4f870b5f9 (diff) |
at91_ide: fix ->ftf_flags handling
Fix some incorrect IDE_FTFLAG_* changes which slipped in commit
"ide: add "flagged" taskfile flags to struct ide_taskfile (v2)"
(commit 19710d25d50ae0be05eebe4231ed8918b1092d82) few days ago.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/at91_ide.c')
-rw-r--r-- | drivers/ide/at91_ide.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/at91_ide.c b/drivers/ide/at91_ide.c index 27547121daff..6bb45a2b24c2 100644 --- a/drivers/ide/at91_ide.c +++ b/drivers/ide/at91_ide.c | |||
@@ -192,10 +192,10 @@ static void at91_ide_tf_load(ide_drive_t *drive, struct ide_cmd *cmd) | |||
192 | struct ide_taskfile *tf = &cmd->tf; | 192 | struct ide_taskfile *tf = &cmd->tf; |
193 | u8 HIHI = (cmd->tf_flags & IDE_TFLAG_LBA48) ? 0xE0 : 0xEF; | 193 | u8 HIHI = (cmd->tf_flags & IDE_TFLAG_LBA48) ? 0xE0 : 0xEF; |
194 | 194 | ||
195 | if (cmd->tf_flags & IDE_FTFLAG_FLAGGED) | 195 | if (cmd->ftf_flags & IDE_FTFLAG_FLAGGED) |
196 | HIHI = 0xFF; | 196 | HIHI = 0xFF; |
197 | 197 | ||
198 | if (cmd->tf_flags & IDE_FTFLAG_OUT_DATA) { | 198 | if (cmd->ftf_flags & IDE_FTFLAG_OUT_DATA) { |
199 | u16 data = (tf->hob_data << 8) | tf->data; | 199 | u16 data = (tf->hob_data << 8) | tf->data; |
200 | 200 | ||
201 | at91_ide_output_data(drive, NULL, &data, 2); | 201 | at91_ide_output_data(drive, NULL, &data, 2); |
@@ -233,7 +233,7 @@ static void at91_ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd) | |||
233 | struct ide_io_ports *io_ports = &hwif->io_ports; | 233 | struct ide_io_ports *io_ports = &hwif->io_ports; |
234 | struct ide_taskfile *tf = &cmd->tf; | 234 | struct ide_taskfile *tf = &cmd->tf; |
235 | 235 | ||
236 | if (cmd->tf_flags & IDE_FTFLAG_IN_DATA) { | 236 | if (cmd->ftf_flags & IDE_FTFLAG_IN_DATA) { |
237 | u16 data; | 237 | u16 data; |
238 | 238 | ||
239 | at91_ide_input_data(drive, NULL, &data, 2); | 239 | at91_ide_input_data(drive, NULL, &data, 2); |