From 611c89c55a8f687df5b515af3913060936978ae9 Mon Sep 17 00:00:00 2001
From: Kiyoshi Ueda <k-ueda@ct.jp.nec.com>
Date: Tue, 11 Dec 2007 17:43:15 -0500
Subject: [PATCH] --- yaml --- r: 77610 b: refs/heads/master c:
 0156c2547e92df559d5592aad9535838ef459615 h: refs/heads/master v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/block/DAC960.c | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index bfd5dad70e95..4227664a069d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4898b53a5e3e4b9a58f1d89545b1e05c88c76798
+refs/heads/master: 0156c2547e92df559d5592aad9535838ef459615
diff --git a/trunk/drivers/block/DAC960.c b/trunk/drivers/block/DAC960.c
index 9030c373ce67..cd03473f3547 100644
--- a/trunk/drivers/block/DAC960.c
+++ b/trunk/drivers/block/DAC960.c
@@ -3455,19 +3455,12 @@ static inline bool DAC960_ProcessCompletedRequest(DAC960_Command_T *Command,
 						 bool SuccessfulIO)
 {
 	struct request *Request = Command->Request;
-	int UpToDate;
-
-	UpToDate = 0;
-	if (SuccessfulIO)
-		UpToDate = 1;
+	int Error = SuccessfulIO ? 0 : -EIO;
 
 	pci_unmap_sg(Command->Controller->PCIDevice, Command->cmd_sglist,
 		Command->SegmentCount, Command->DmaDirection);
 
-	 if (!end_that_request_first(Request, UpToDate, Command->BlockCount)) {
-		add_disk_randomness(Request->rq_disk);
- 	 	end_that_request_last(Request, UpToDate);
-
+	 if (!__blk_end_request(Request, Error, Command->BlockCount << 9)) {
 		if (Command->Completion) {
 			complete(Command->Completion);
 			Command->Completion = NULL;