Commit 4d7a984bdcbdda69fc6b2a4a655415140270aa7b
Committed by
Bartlomiej Zolnierkiewicz
Bartlomiej Zolnierkiewicz
1 parent
79f21b84d9
Exists in
master
and in
4 other branches
ide: task_end_request() fix
task_end_request() modified to always call ide_end_drive_cmd() for taskfile requests. Previously, ide_end_drive_cmd() was called only when IDE_TFLAG_FLAGGED was set. Also, ide_dma_intr() is modified to use task_end_request(). Enables TASKFILE ioctls to get valid register outputs on successful completion. Bart: - ported it over recent IDE changes Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Showing 3 changed files with 7 additions and 14 deletions Side-by-side Diff
drivers/ide/ide-dma.c
| ... | ... | @@ -153,13 +153,7 @@ |
| 153 | 153 | if (!dma_stat) { |
| 154 | 154 | struct request *rq = HWGROUP(drive)->rq; |
| 155 | 155 | |
| 156 | - if (rq->rq_disk) { | |
| 157 | - ide_driver_t *drv; | |
| 158 | - | |
| 159 | - drv = *(ide_driver_t **)rq->rq_disk->private_data; | |
| 160 | - drv->end_request(drive, 1, rq->nr_sectors); | |
| 161 | - } else | |
| 162 | - ide_end_request(drive, 1, rq->nr_sectors); | |
| 156 | + task_end_request(drive, rq, stat); | |
| 163 | 157 | return ide_stopped; |
| 164 | 158 | } |
| 165 | 159 | printk(KERN_ERR "%s: dma_intr: bad DMA status (dma_stat=%x)\n", |
drivers/ide/ide-taskfile.c
| ... | ... | @@ -408,16 +408,13 @@ |
| 408 | 408 | return ide_error(drive, s, stat); |
| 409 | 409 | } |
| 410 | 410 | |
| 411 | -static void task_end_request(ide_drive_t *drive, struct request *rq, u8 stat) | |
| 411 | +void task_end_request(ide_drive_t *drive, struct request *rq, u8 stat) | |
| 412 | 412 | { |
| 413 | 413 | if (rq->cmd_type == REQ_TYPE_ATA_TASKFILE) { |
| 414 | - ide_task_t *task = rq->special; | |
| 414 | + u8 err = drive->hwif->INB(IDE_ERROR_REG); | |
| 415 | 415 | |
| 416 | - if (task->tf_flags & IDE_TFLAG_FLAGGED) { | |
| 417 | - u8 err = drive->hwif->INB(IDE_ERROR_REG); | |
| 418 | - ide_end_drive_cmd(drive, stat, err); | |
| 419 | - return; | |
| 420 | - } | |
| 416 | + ide_end_drive_cmd(drive, stat, err); | |
| 417 | + return; | |
| 421 | 418 | } |
| 422 | 419 | |
| 423 | 420 | if (rq->rq_disk) { |
include/linux/ide.h
| ... | ... | @@ -993,6 +993,8 @@ |
| 993 | 993 | |
| 994 | 994 | ide_startstop_t do_rw_taskfile(ide_drive_t *, ide_task_t *); |
| 995 | 995 | |
| 996 | +void task_end_request(ide_drive_t *, struct request *, u8); | |
| 997 | + | |
| 996 | 998 | int ide_raw_taskfile(ide_drive_t *, ide_task_t *, u8 *, u16); |
| 997 | 999 | int ide_no_data_taskfile(ide_drive_t *, ide_task_t *); |
| 998 | 1000 |