From c7549e292a618931466a33759e332d65fc93cc5f Mon Sep 17 00:00:00 2001
From: Borislav Petkov <petkovbb@gmail.com>
Date: Tue, 31 Mar 2009 20:15:34 +0200
Subject: [PATCH] --- yaml --- r: 139455 b: refs/heads/master c:
 5b6c942dd1f13835eff8105ec2aa859544a1498d h: refs/heads/master i:   139453:
 e03088ad358a7907cda3c7025a40654b00ebc88d   139451:
 5e89e5991c2e650c3cecd5b2471ddde1e9eb87c6   139447:
 58ff787509c60b439e83da1cc9611c315b888a3f   139439:
 8a90afcd53ed047ce6f5b856c595b96df3886493   139423:
 db1f0bb0882cd96f1eb0457fa87afc9b55bf1460   139391:
 0254053a22d7b40a345d92a428fa46183b922123 v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/ide/ide-atapi.c | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index e2bf63061904..bf82eec83ff2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d80c592c38378c88c568b96963f7a98d927d05fa
+refs/heads/master: 5b6c942dd1f13835eff8105ec2aa859544a1498d
diff --git a/trunk/drivers/ide/ide-atapi.c b/trunk/drivers/ide/ide-atapi.c
index 100e6f94b4f0..3e43b889dd64 100644
--- a/trunk/drivers/ide/ide-atapi.c
+++ b/trunk/drivers/ide/ide-atapi.c
@@ -310,16 +310,14 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
 			pc->xferred = pc->req_xfer;
 			if (drive->pc_update_buffers)
 				drive->pc_update_buffers(drive, pc);
-
-			if (drive->media == ide_floppy)
-				ide_complete_rq(drive, 0, blk_rq_bytes(rq));
 		}
 		debug_log("%s: DMA finished\n", drive->name);
 	}
 
 	/* No more interrupts */
 	if ((stat & ATA_DRQ) == 0) {
-		int uptodate;
+		int uptodate, error;
+		unsigned int done;
 
 		debug_log("Packet command completed, %d bytes transferred\n",
 			  pc->xferred);
@@ -366,9 +364,9 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
 
 		if (blk_special_request(rq)) {
 			rq->errors = 0;
-			ide_complete_rq(drive, 0, blk_rq_bytes(rq));
+			done = blk_rq_bytes(rq);
+			error = 0;
 		} else {
-			unsigned int done;
 
 			if (blk_fs_request(rq) == 0 && uptodate <= 0) {
 				if (rq->errors == 0)
@@ -380,9 +378,10 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
 			else
 				done = blk_rq_bytes(rq);
 
-			ide_complete_rq(drive, uptodate ? 0 : -EIO, done);
+			error = uptodate ? 0 : -EIO;
 		}
 
+		ide_complete_rq(drive, error, done);
 		return ide_stopped;
 	}