diff options
-rw-r--r-- | drivers/block/xsysace.c | 6 |
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) | |||
483 | u32 status; | 483 | u32 status; |
484 | u16 val; | 484 | u16 val; |
485 | int count; | 485 | int count; |
486 | int i; | ||
487 | 486 | ||
488 | #if defined(DEBUG) | 487 | #if defined(DEBUG) |
489 | dev_dbg(ace->dev, "fsm_state=%i, id_req_count=%i\n", | 488 | 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) | |||
688 | } | 687 | } |
689 | 688 | ||
690 | /* Transfer the next buffer */ | 689 | /* Transfer the next buffer */ |
691 | i = 16; | ||
692 | if (ace->fsm_task == ACE_TASK_WRITE) | 690 | if (ace->fsm_task == ACE_TASK_WRITE) |
693 | ace->reg_ops->dataout(ace); | 691 | ace->reg_ops->dataout(ace); |
694 | else | 692 | else |
@@ -702,8 +700,8 @@ static void ace_fsm_dostate(struct ace_device *ace) | |||
702 | } | 700 | } |
703 | 701 | ||
704 | /* bio finished; is there another one? */ | 702 | /* bio finished; is there another one? */ |
705 | i = ace->req->current_nr_sectors; | 703 | if (__blk_end_request(ace->req, 0, |
706 | if (__blk_end_request(ace->req, 0, i)) { | 704 | blk_rq_cur_bytes(ace->req))) { |
707 | /* dev_dbg(ace->dev, "next block; h=%li c=%i\n", | 705 | /* dev_dbg(ace->dev, "next block; h=%li c=%i\n", |
708 | * ace->req->hard_nr_sectors, | 706 | * ace->req->hard_nr_sectors, |
709 | * ace->req->current_nr_sectors); | 707 | * ace->req->current_nr_sectors); |