From fa2fc73fb3f2dc466916c45861f64d6d424b089c Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Sun, 19 Apr 2009 08:46:02 +0900 Subject: [PATCH] --- yaml --- r: 146957 b: refs/heads/master c: 08f370f0a2fb223bf48d0bfa2a173be0393c19dc h: refs/heads/master i: 146955: 297cf40145f8d8f6fbd4b0b5b56861b7b98e3e49 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 023777b662da..9da166ab0441 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 765139ef5f1a4b1d5cb1f1a7a12de7ee61f6500f +refs/heads/master: 08f370f0a2fb223bf48d0bfa2a173be0393c19dc 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]);