diff options
Diffstat (limited to 'drivers/ide/ide-taskfile.c')
| -rw-r--r-- | drivers/ide/ide-taskfile.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c index 97a9244312fc..1d0470c1f957 100644 --- a/drivers/ide/ide-taskfile.c +++ b/drivers/ide/ide-taskfile.c | |||
| @@ -363,7 +363,7 @@ static ide_startstop_t task_error(ide_drive_t *drive, struct request *rq, | |||
| 363 | 363 | ||
| 364 | static void task_end_request(ide_drive_t *drive, struct request *rq, u8 stat) | 364 | static void task_end_request(ide_drive_t *drive, struct request *rq, u8 stat) |
| 365 | { | 365 | { |
| 366 | if (rq->flags & REQ_DRIVE_TASKFILE) { | 366 | if (rq->cmd_type == REQ_TYPE_ATA_TASKFILE) { |
| 367 | ide_task_t *task = rq->special; | 367 | ide_task_t *task = rq->special; |
| 368 | 368 | ||
| 369 | if (task->tf_out_flags.all) { | 369 | if (task->tf_out_flags.all) { |
| @@ -474,7 +474,7 @@ static int ide_diag_taskfile(ide_drive_t *drive, ide_task_t *args, unsigned long | |||
| 474 | struct request rq; | 474 | struct request rq; |
| 475 | 475 | ||
| 476 | memset(&rq, 0, sizeof(rq)); | 476 | memset(&rq, 0, sizeof(rq)); |
| 477 | rq.flags = REQ_DRIVE_TASKFILE; | 477 | rq.cmd_type = REQ_TYPE_ATA_TASKFILE; |
| 478 | rq.buffer = buf; | 478 | rq.buffer = buf; |
| 479 | 479 | ||
| 480 | /* | 480 | /* |
| @@ -499,7 +499,7 @@ static int ide_diag_taskfile(ide_drive_t *drive, ide_task_t *args, unsigned long | |||
| 499 | rq.hard_cur_sectors = rq.current_nr_sectors = rq.nr_sectors; | 499 | rq.hard_cur_sectors = rq.current_nr_sectors = rq.nr_sectors; |
| 500 | 500 | ||
| 501 | if (args->command_type == IDE_DRIVE_TASK_RAW_WRITE) | 501 | if (args->command_type == IDE_DRIVE_TASK_RAW_WRITE) |
| 502 | rq.flags |= REQ_RW; | 502 | rq.cmd_flags |= REQ_RW; |
| 503 | } | 503 | } |
| 504 | 504 | ||
| 505 | rq.special = args; | 505 | rq.special = args; |
| @@ -737,7 +737,7 @@ static int ide_wait_cmd_task(ide_drive_t *drive, u8 *buf) | |||
| 737 | struct request rq; | 737 | struct request rq; |
| 738 | 738 | ||
| 739 | ide_init_drive_cmd(&rq); | 739 | ide_init_drive_cmd(&rq); |
| 740 | rq.flags = REQ_DRIVE_TASK; | 740 | rq.cmd_type = REQ_TYPE_ATA_TASK; |
| 741 | rq.buffer = buf; | 741 | rq.buffer = buf; |
| 742 | return ide_do_drive_cmd(drive, &rq, ide_wait); | 742 | return ide_do_drive_cmd(drive, &rq, ide_wait); |
| 743 | } | 743 | } |
