diff options
Diffstat (limited to 'drivers/ide/ide-io.c')
-rw-r--r-- | drivers/ide/ide-io.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index f01b103e55f0..0f3e2f4f9c2c 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c | |||
@@ -231,7 +231,7 @@ static ide_startstop_t ide_start_power_step(ide_drive_t *drive, struct request * | |||
231 | return ide_stopped; | 231 | return ide_stopped; |
232 | 232 | ||
233 | out_do_tf: | 233 | out_do_tf: |
234 | args->tf_flags = IDE_TFLAG_OUT_TF | IDE_TFLAG_OUT_DEVICE; | 234 | args->tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE; |
235 | args->data_phase = TASKFILE_NO_DATA; | 235 | args->data_phase = TASKFILE_NO_DATA; |
236 | return do_rw_taskfile(drive, args); | 236 | return do_rw_taskfile(drive, args); |
237 | } | 237 | } |
@@ -385,10 +385,6 @@ void ide_end_drive_cmd (ide_drive_t *drive, u8 stat, u8 err) | |||
385 | tf->error = err; | 385 | tf->error = err; |
386 | tf->status = stat; | 386 | tf->status = stat; |
387 | 387 | ||
388 | args->tf_flags |= (IDE_TFLAG_IN_TF|IDE_TFLAG_IN_DEVICE); | ||
389 | if (args->tf_flags & IDE_TFLAG_LBA48) | ||
390 | args->tf_flags |= IDE_TFLAG_IN_HOB; | ||
391 | |||
392 | ide_tf_read(drive, args); | 388 | ide_tf_read(drive, args); |
393 | } | 389 | } |
394 | } else if (blk_pm_request(rq)) { | 390 | } else if (blk_pm_request(rq)) { |
@@ -712,7 +708,7 @@ static ide_startstop_t ide_disk_special(ide_drive_t *drive) | |||
712 | return ide_stopped; | 708 | return ide_stopped; |
713 | } | 709 | } |
714 | 710 | ||
715 | args.tf_flags = IDE_TFLAG_OUT_TF | IDE_TFLAG_OUT_DEVICE | | 711 | args.tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE | |
716 | IDE_TFLAG_CUSTOM_HANDLER; | 712 | IDE_TFLAG_CUSTOM_HANDLER; |
717 | 713 | ||
718 | do_rw_taskfile(drive, &args); | 714 | do_rw_taskfile(drive, &args); |