From 662f8123318bc569d6e46dc9f561449cc607cec9 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Tue, 29 Jan 2008 21:54:53 +0100 Subject: [PATCH] --- yaml --- r: 79550 b: refs/heads/master c: 9bf722598fcd51073974850ae026b44389430ecc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/xsysace.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d4919542785c..76e2d2718301 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ba6c33bcddc64a54b5f1c25a696c4767dc76292 +refs/heads/master: 9bf722598fcd51073974850ae026b44389430ecc diff --git a/trunk/drivers/block/xsysace.c b/trunk/drivers/block/xsysace.c index 2c81465fd60c..78ebfffc77e3 100644 --- a/trunk/drivers/block/xsysace.c +++ b/trunk/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);