3 files changed, 23 insertions, 22 deletions

diff --git a/drivers/block/paride/pcd.c b/drivers/block/paride/pcd.c
index e91d4b4b014f..9fd57c2aa463 100644
--- a/drivers/block/paride/pcd.c
+++ b/drivers/block/paride/pcd.c
@@ -735,16 +735,16 @@ static void do_pcd_request(struct request_queue * q)
                         ps_set_intr(do_pcd_read, NULL, 0, nice);
                         return;
                 } else
-                        end_request(pcd_req, 0);
+                        __blk_end_request_cur(pcd_req, -EIO);
         }
 }
 
-static inline void next_request(int success)
+static inline void next_request(int err)
 {
         unsigned long saved_flags;
 
         spin_lock_irqsave(&pcd_lock, saved_flags);
-        end_request(pcd_req, success);
+        __blk_end_request_cur(pcd_req, err);
         pcd_busy = 0;
         do_pcd_request(pcd_queue);
         spin_unlock_irqrestore(&pcd_lock, saved_flags);
@@ -781,7 +781,7 @@ static void pcd_start(void)
 
         if (pcd_command(pcd_current, rd_cmd, 2048, "read block")) {
                 pcd_bufblk = -1;
-                next_request(0);
+                next_request(-EIO);
                 return;
         }
 
@@ -796,7 +796,7 @@ static void do_pcd_read(void)
         pcd_retries = 0;
         pcd_transfer();
         if (!pcd_count) {
-                next_request(1);
+                next_request(0);
                 return;
         }
 
@@ -815,7 +815,7 @@ static void do_pcd_read_drq(void)
                         return;
                 }
                 pcd_bufblk = -1;
-                next_request(0);
+                next_request(-EIO);
                 return;
         }
 
diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c
index 9299455b0af6..0732df4e901a 100644
--- a/drivers/block/paride/pd.c
+++ b/drivers/block/paride/pd.c
@@ -410,7 +410,8 @@ static void run_fsm(void)
                                 pd_claimed = 0;
                                 phase = NULL;
                                 spin_lock_irqsave(&pd_lock, saved_flags);
-                                end_request(pd_req, res);
+                                __blk_end_request_cur(pd_req,
+                                                      res == Ok ? 0 : -EIO);
                                 pd_req = elv_next_request(pd_queue);
                                 if (!pd_req)
                                         stop = 1;
@@ -477,7 +478,7 @@ static int pd_next_buf(void)
         if (pd_count)
                 return 0;
         spin_lock_irqsave(&pd_lock, saved_flags);
-        end_request(pd_req, 1);
+        __blk_end_request_cur(pd_req, 0);
         pd_count = pd_req->current_nr_sectors;
         pd_buf = pd_req->buffer;
         spin_unlock_irqrestore(&pd_lock, saved_flags);
diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c
index bef3b997ba3e..3871e3586d6d 100644
--- a/drivers/block/paride/pf.c
+++ b/drivers/block/paride/pf.c
@@ -750,10 +750,10 @@ static int pf_ready(void)
 
 static struct request_queue *pf_queue;
 
-static void pf_end_request(int uptodate)
+static void pf_end_request(int err)
 {
         if (pf_req) {
-                end_request(pf_req, uptodate);
+                __blk_end_request_cur(pf_req, err);
                 pf_req = NULL;
         }
 }
@@ -773,7 +773,7 @@ repeat:
         pf_count = pf_req->current_nr_sectors;
 
         if (pf_block + pf_count > get_capacity(pf_req->rq_disk)) {
-                pf_end_request(0);
+                pf_end_request(-EIO);
                 goto repeat;
         }
 
@@ -788,7 +788,7 @@ repeat:
                 pi_do_claimed(pf_current->pi, do_pf_write);
         else {
                 pf_busy = 0;
-                pf_end_request(0);
+                pf_end_request(-EIO);
                 goto repeat;
         }
 }
@@ -805,7 +805,7 @@ static int pf_next_buf(void)
                 return 1;
         if (!pf_count) {
                 spin_lock_irqsave(&pf_spin_lock, saved_flags);
-                pf_end_request(1);
+                pf_end_request(0);
                 pf_req = elv_next_request(pf_queue);
                 spin_unlock_irqrestore(&pf_spin_lock, saved_flags);
                 if (!pf_req)
@@ -816,12 +816,12 @@ static int pf_next_buf(void)
         return 0;
 }
 
-static inline void next_request(int success)
+static inline void next_request(int err)
 {
         unsigned long saved_flags;
 
         spin_lock_irqsave(&pf_spin_lock, saved_flags);
-        pf_end_request(success);
+        pf_end_request(err);
         pf_busy = 0;
         do_pf_request(pf_queue);
         spin_unlock_irqrestore(&pf_spin_lock, saved_flags);
@@ -844,7 +844,7 @@ static void do_pf_read_start(void)
                         pi_do_claimed(pf_current->pi, do_pf_read_start);
                         return;
                 }
-                next_request(0);
+                next_request(-EIO);
                 return;
         }
         pf_mask = STAT_DRQ;
@@ -863,7 +863,7 @@ static void do_pf_read_drq(void)
                                 pi_do_claimed(pf_current->pi, do_pf_read_start);
                                 return;
                         }
-                        next_request(0);
+                        next_request(-EIO);
                         return;
                 }
                 pi_read_block(pf_current->pi, pf_buf, 512);
@@ -871,7 +871,7 @@ static void do_pf_read_drq(void)
                         break;
         }
         pi_disconnect(pf_current->pi);
-        next_request(1);
+        next_request(0);
 }
 
 static void do_pf_write(void)
@@ -890,7 +890,7 @@ static void do_pf_write_start(void)
                         pi_do_claimed(pf_current->pi, do_pf_write_start);
                         return;
                 }
-                next_request(0);
+                next_request(-EIO);
                 return;
         }
 
@@ -903,7 +903,7 @@ static void do_pf_write_start(void)
                                 pi_do_claimed(pf_current->pi, do_pf_write_start);
                                 return;
                         }
-                        next_request(0);
+                        next_request(-EIO);
                         return;
                 }
                 pi_write_block(pf_current->pi, pf_buf, 512);
@@ -923,11 +923,11 @@ static void do_pf_write_done(void)
                         pi_do_claimed(pf_current->pi, do_pf_write_start);
                         return;
                 }
-                next_request(0);
+                next_request(-EIO);
                 return;
         }
         pi_disconnect(pf_current->pi);
-        next_request(1);
+        next_request(0);
 }
 
 static int __init pf_init(void)