summaryrefslogtreecommitdiff
path: root/drivers/ide/ide-io.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-01-25 22:17:15 +0100
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-01-25 22:17:15 +0100
commit1edee60e9d994f2b9a79b1333be39790683541fe (patch)
treef180358d478d5f9366267afd8c9ff2104a2cb930 /drivers/ide/ide-io.c
parenta7bbd20b50fb12b3a604c396b3d8a3449a43edcc (diff)
ide: merge flagged_taskfile() into do_rw_taskfile()
Based on the earlier work by Tejun Heo. task->data_phase == TASKFILE_MULTI_{IN,OUT} vs drive->mult_count == 0 check is needed also for ide_taskfile_ioctl() requests that don't have IDE_TFLAG_FLAGGED taskfile flag set. Cc: Tejun Heo <htejun@gmail.com> Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-io.c')
-rw-r--r--drivers/ide/ide-io.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 1112d8b049b9..1af2cc4f864e 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -851,9 +851,6 @@ static ide_startstop_t execute_drive_cmd (ide_drive_t *drive,
break;
}
- if (task->tf_flags & IDE_TFLAG_FLAGGED)
- return flagged_taskfile(drive, task);
-
return do_rw_taskfile(drive, task);
}