1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c
index 2c81465fd60c..78ebfffc77e3 100644
--- a/drivers/block/xsysace.c
+++ b/drivers/block/xsysace.c
@@ -483,7 +483,6 @@ static void ace_fsm_dostate(struct ace_device *ace)
         u32 status;
         u16 val;
         int count;
-        int i;
 
 #if defined(DEBUG)
         dev_dbg(ace->dev, "fsm_state=%i, id_req_count=%i\n",
@@ -688,7 +687,6 @@ static void ace_fsm_dostate(struct ace_device *ace)
                 }
 
                 /* Transfer the next buffer */
-                i = 16;
                 if (ace->fsm_task == ACE_TASK_WRITE)
                         ace->reg_ops->dataout(ace);
                 else
@@ -702,8 +700,8 @@ static void ace_fsm_dostate(struct ace_device *ace)
                 }
 
                 /* bio finished; is there another one? */
-                i = ace->req->current_nr_sectors;
-                if (__blk_end_request(ace->req, 0, i)) {
+                if (__blk_end_request(ace->req, 0,
+                                        blk_rq_cur_bytes(ace->req))) {
                         /* dev_dbg(ace->dev, "next block; h=%li c=%i\n",
                          *      ace->req->hard_nr_sectors,
                          *      ace->req->current_nr_sectors);