1 files changed, 2 insertions, 9 deletions

diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index 9030c373ce67..cd03473f3547 100644
--- a/drivers/block/DAC960.c
+++ b/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;