From 02ef5bc0b3e458a3fdae105d040284a64d49962f Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Sun, 19 Apr 2009 08:46:02 +0900 Subject: [PATCH] --- yaml --- r: 146339 b: refs/heads/master c: ea7066afcd590e4663e6dc010f93704164050f48 h: refs/heads/master i: 146337: 9966ce89ef5825e01afdf9c27cb1244b1f9af446 146335: 6544906f439b032a4f7a1a151fa240cdd912eaeb v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-floppy.c | 1 + trunk/drivers/ide/ide-tape.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 6497b1247fdf..6b5bffe2981c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fc38b521dcffcb07447cd98fedc56f495c10b90d +refs/heads/master: ea7066afcd590e4663e6dc010f93704164050f48 diff --git a/trunk/drivers/ide/ide-floppy.c b/trunk/drivers/ide/ide-floppy.c index d3302cc891e4..d20704ac3183 100644 --- a/trunk/drivers/ide/ide-floppy.c +++ b/trunk/drivers/ide/ide-floppy.c @@ -141,6 +141,7 @@ static ide_startstop_t ide_floppy_issue_pc(ide_drive_t *drive, drive->failed_pc = NULL; drive->pc_callback(drive, 0); + ide_complete_rq(drive, -EIO, blk_rq_bytes(drive->hwif->rq)); return ide_stopped; } diff --git a/trunk/drivers/ide/ide-tape.c b/trunk/drivers/ide/ide-tape.c index 9b762a2d5d95..2b9a13671c5f 100644 --- a/trunk/drivers/ide/ide-tape.c +++ b/trunk/drivers/ide/ide-tape.c @@ -643,6 +643,7 @@ static ide_startstop_t ide_tape_issue_pc(ide_drive_t *drive, } drive->failed_pc = NULL; drive->pc_callback(drive, 0); + ide_complete_rq(drive, -EIO, blk_rq_bytes(drive->hwif->rq)); return ide_stopped; } debug_log(DBG_SENSE, "Retry #%d, cmd = %02X\n", pc->retries, pc->c[0]);