diff options
Diffstat (limited to 'drivers/ide/ide-taskfile.c')
-rw-r--r-- | drivers/ide/ide-taskfile.c | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c index bbf7740d58a5..f99a6aaad9eb 100644 --- a/drivers/ide/ide-taskfile.c +++ b/drivers/ide/ide-taskfile.c | |||
@@ -155,12 +155,8 @@ static ide_startstop_t task_no_data_intr(ide_drive_t *drive) | |||
155 | 155 | ||
156 | if (blk_pm_request(rq)) | 156 | if (blk_pm_request(rq)) |
157 | ide_complete_pm_rq(drive, rq); | 157 | ide_complete_pm_rq(drive, rq); |
158 | else { | 158 | else |
159 | u8 err = ide_read_error(drive); | 159 | ide_finish_cmd(drive, cmd, stat); |
160 | |||
161 | ide_complete_cmd(drive, cmd, stat, err); | ||
162 | ide_complete_rq(drive, err); | ||
163 | } | ||
164 | } | 160 | } |
165 | 161 | ||
166 | return ide_stopped; | 162 | return ide_stopped; |
@@ -293,15 +289,10 @@ static void ide_error_cmd(ide_drive_t *drive, struct ide_cmd *cmd) | |||
293 | 289 | ||
294 | void ide_finish_cmd(ide_drive_t *drive, struct ide_cmd *cmd, u8 stat) | 290 | void ide_finish_cmd(ide_drive_t *drive, struct ide_cmd *cmd, u8 stat) |
295 | { | 291 | { |
296 | if ((cmd->tf_flags & IDE_TFLAG_FS) == 0) { | 292 | u8 err = ide_read_error(drive); |
297 | u8 err = ide_read_error(drive); | ||
298 | 293 | ||
299 | ide_complete_cmd(drive, cmd, stat, err); | 294 | ide_complete_cmd(drive, cmd, stat, err); |
300 | ide_complete_rq(drive, err); | 295 | ide_complete_rq(drive, err); |
301 | return; | ||
302 | } | ||
303 | |||
304 | ide_end_request(drive, 1, cmd->rq->nr_sectors); | ||
305 | } | 296 | } |
306 | 297 | ||
307 | /* | 298 | /* |
@@ -356,7 +347,10 @@ out_wait: | |||
356 | ide_set_handler(drive, &task_pio_intr, WAIT_WORSTCASE, NULL); | 347 | ide_set_handler(drive, &task_pio_intr, WAIT_WORSTCASE, NULL); |
357 | return ide_started; | 348 | return ide_started; |
358 | out_end: | 349 | out_end: |
359 | ide_finish_cmd(drive, cmd, stat); | 350 | if ((cmd->tf_flags & IDE_TFLAG_FS) == 0) |
351 | ide_finish_cmd(drive, cmd, stat); | ||
352 | else | ||
353 | ide_end_request(drive, 1, cmd->rq->nr_sectors); | ||
360 | return ide_stopped; | 354 | return ide_stopped; |
361 | out_err: | 355 | out_err: |
362 | ide_error_cmd(drive, cmd); | 356 | ide_error_cmd(drive, cmd); |