aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-taskfile.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/ide-taskfile.c')
-rw-r--r--drivers/ide/ide-taskfile.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 79900a7a62e6..c02687507682 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -280,8 +280,7 @@ static void ide_pio_datablock(ide_drive_t *drive, struct ide_cmd *cmd,
280 drive->io_32bit = saved_io_32bit; 280 drive->io_32bit = saved_io_32bit;
281} 281}
282 282
283static ide_startstop_t task_error(ide_drive_t *drive, struct ide_cmd *cmd, 283static void ide_error_cmd(ide_drive_t *drive, struct ide_cmd *cmd)
284 const char *s, u8 stat)
285{ 284{
286 if (cmd->tf_flags & IDE_TFLAG_FS) { 285 if (cmd->tf_flags & IDE_TFLAG_FS) {
287 int sectors = cmd->nsect - cmd->nleft; 286 int sectors = cmd->nsect - cmd->nleft;
@@ -297,7 +296,6 @@ static ide_startstop_t task_error(ide_drive_t *drive, struct ide_cmd *cmd,
297 if (sectors > 0) 296 if (sectors > 0)
298 ide_end_request(drive, 1, sectors); 297 ide_end_request(drive, 1, sectors);
299 } 298 }
300 return ide_error(drive, s, stat);
301} 299}
302 300
303void ide_finish_cmd(ide_drive_t *drive, struct ide_cmd *cmd, u8 stat) 301void ide_finish_cmd(ide_drive_t *drive, struct ide_cmd *cmd, u8 stat)
@@ -368,7 +366,8 @@ out_end:
368 ide_finish_cmd(drive, cmd, stat); 366 ide_finish_cmd(drive, cmd, stat);
369 return ide_stopped; 367 return ide_stopped;
370out_err: 368out_err:
371 return task_error(drive, cmd, __func__, stat); 369 ide_error_cmd(drive, cmd);
370 return ide_error(drive, __func__, stat);
372} 371}
373 372
374static ide_startstop_t pre_task_out_intr(ide_drive_t *drive, 373static ide_startstop_t pre_task_out_intr(ide_drive_t *drive,