From 9158b15f777a2e79a39b93d32b12c44894b69821 Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Fri, 27 Mar 2009 12:46:42 +0100
Subject: [PATCH] --- yaml --- r: 137674 b: refs/heads/master c:
 2230d90dd889e35da2728b6f6ebf25fb5a6499bd h: refs/heads/master v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/ide/ide-dma.c      |  5 ++++-
 trunk/drivers/ide/ide-taskfile.c | 24 +++++++++---------------
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 48ec874519ab..b7d127acd839 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d364c7f50b3bb6dc77259974038567b821e2cf0a
+refs/heads/master: 2230d90dd889e35da2728b6f6ebf25fb5a6499bd
diff --git a/trunk/drivers/ide/ide-dma.c b/trunk/drivers/ide/ide-dma.c
index cba9fe585d87..820e5104ba47 100644
--- a/trunk/drivers/ide/ide-dma.c
+++ b/trunk/drivers/ide/ide-dma.c
@@ -98,7 +98,10 @@ ide_startstop_t ide_dma_intr(ide_drive_t *drive)
 		if (!dma_stat) {
 			struct ide_cmd *cmd = &hwif->cmd;
 
-			ide_finish_cmd(drive, cmd, stat);
+			if ((cmd->tf_flags & IDE_TFLAG_FS) == 0)
+				ide_finish_cmd(drive, cmd, stat);
+			else
+				ide_end_request(drive, 1, cmd->rq->nr_sectors);
 			return ide_stopped;
 		}
 		printk(KERN_ERR "%s: %s: bad DMA status (0x%02x)\n",
diff --git a/trunk/drivers/ide/ide-taskfile.c b/trunk/drivers/ide/ide-taskfile.c
index bbf7740d58a5..f99a6aaad9eb 100644
--- a/trunk/drivers/ide/ide-taskfile.c
+++ b/trunk/drivers/ide/ide-taskfile.c
@@ -155,12 +155,8 @@ static ide_startstop_t task_no_data_intr(ide_drive_t *drive)
 
 		if (blk_pm_request(rq))
 			ide_complete_pm_rq(drive, rq);
-		else {
-			u8 err = ide_read_error(drive);
-
-			ide_complete_cmd(drive, cmd, stat, err);
-			ide_complete_rq(drive, err);
-		}
+		else
+			ide_finish_cmd(drive, cmd, stat);
 	}
 
 	return ide_stopped;
@@ -293,15 +289,10 @@ static void ide_error_cmd(ide_drive_t *drive, struct ide_cmd *cmd)
 
 void ide_finish_cmd(ide_drive_t *drive, struct ide_cmd *cmd, u8 stat)
 {
-	if ((cmd->tf_flags & IDE_TFLAG_FS) == 0) {
-		u8 err = ide_read_error(drive);
+	u8 err = ide_read_error(drive);
 
-		ide_complete_cmd(drive, cmd, stat, err);
-		ide_complete_rq(drive, err);
-		return;
-	}
-
-	ide_end_request(drive, 1, cmd->rq->nr_sectors);
+	ide_complete_cmd(drive, cmd, stat, err);
+	ide_complete_rq(drive, err);
 }
 
 /*
@@ -356,7 +347,10 @@ static ide_startstop_t task_pio_intr(ide_drive_t *drive)
 	ide_set_handler(drive, &task_pio_intr, WAIT_WORSTCASE, NULL);
 	return ide_started;
 out_end:
-	ide_finish_cmd(drive, cmd, stat);
+	if ((cmd->tf_flags & IDE_TFLAG_FS) == 0)
+		ide_finish_cmd(drive, cmd, stat);
+	else
+		ide_end_request(drive, 1, cmd->rq->nr_sectors);
 	return ide_stopped;
 out_err:
 	ide_error_cmd(drive, cmd);