From 31cee76e9bbc87781ecf81edece21d629408d0a0 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Fri, 27 Mar 2009 12:46:41 +0100 Subject: [PATCH] --- yaml --- r: 137671 b: refs/heads/master c: 041cea10a86a25b088185d07ad15d728f503f02c h: refs/heads/master i: 137669: 7e6d787a355534277a2cca63ce2aadd79281a1e1 137667: 5f31a941acbd1f3633d06d859fdc98962366ce71 137663: fd8c211846be80c85f15b1e12200e45be1202138 v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-taskfile.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 660c30a4e0be..3112adf19290 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0a1248c5a754cc8dc5b10a902d2f86b40144165c +refs/heads/master: 041cea10a86a25b088185d07ad15d728f503f02c diff --git a/trunk/drivers/ide/ide-taskfile.c b/trunk/drivers/ide/ide-taskfile.c index 79900a7a62e6..c02687507682 100644 --- a/trunk/drivers/ide/ide-taskfile.c +++ b/trunk/drivers/ide/ide-taskfile.c @@ -280,8 +280,7 @@ static void ide_pio_datablock(ide_drive_t *drive, struct ide_cmd *cmd, drive->io_32bit = saved_io_32bit; } -static ide_startstop_t task_error(ide_drive_t *drive, struct ide_cmd *cmd, - const char *s, u8 stat) +static void ide_error_cmd(ide_drive_t *drive, struct ide_cmd *cmd) { if (cmd->tf_flags & IDE_TFLAG_FS) { int sectors = cmd->nsect - cmd->nleft; @@ -297,7 +296,6 @@ static ide_startstop_t task_error(ide_drive_t *drive, struct ide_cmd *cmd, if (sectors > 0) ide_end_request(drive, 1, sectors); } - return ide_error(drive, s, stat); } void ide_finish_cmd(ide_drive_t *drive, struct ide_cmd *cmd, u8 stat) @@ -368,7 +366,8 @@ static ide_startstop_t task_pio_intr(ide_drive_t *drive) ide_finish_cmd(drive, cmd, stat); return ide_stopped; out_err: - return task_error(drive, cmd, __func__, stat); + ide_error_cmd(drive, cmd); + return ide_error(drive, __func__, stat); } static ide_startstop_t pre_task_out_intr(ide_drive_t *drive,