diff options
| author |   Pierre Ossman <drzeus@drzeus.cx> | 2008-07-29 01:23:24 +0200 |
|---|---|---|
| committer | Pierre Ossman <drzeus@drzeus.cx> | 2008-08-01 19:03:38 +0200 |
| commit | b41e9c7b8e14ea57aa0fc05fd63a0de0e935d58d (patch) | |
| tree | f81ed91f4d32ec993332388222c7e56028663e2e /drivers | |
| parent | mmc: properly iterate over sg list in debug check (diff) | |
| download | linux-dev-b41e9c7b8e14ea57aa0fc05fd63a0de0e935d58d.tar.xz linux-dev-b41e9c7b8e14ea57aa0fc05fd63a0de0e935d58d.zip | |
mmc_block: use proper sg iterators
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/card/block.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index 66e5a5487c20..86dbb366415a 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -213,7 +213,8 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req) struct mmc_blk_data *md = mq->data; struct mmc_card *card = md->queue.card; struct mmc_blk_request brq; - int ret = 1, sg_pos, data_size; + int ret = 1, data_size, i; + struct scatterlist *sg; mmc_claim_host(card->host); @@ -267,18 +268,22 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req) mmc_queue_bounce_pre(mq); + /* + * Adjust the sg list so it is the same size as the + * request. + */ if (brq.data.blocks != (req->nr_sectors >> (md->block_bits - 9))) { data_size = brq.data.blocks * brq.data.blksz; - for (sg_pos = 0; sg_pos < brq.data.sg_len; sg_pos++) { - data_size -= mq->sg[sg_pos].length; + for_each_sg(brq.data.sg, sg, brq.data.sg_len, i) { + data_size -= sg->length; if (data_size <= 0) { - mq->sg[sg_pos].length += data_size; - sg_pos++; + sg->length += data_size; + i++; break; } } - brq.data.sg_len = sg_pos; + brq.data.sg_len = i; } mmc_wait_for_req(card->host, &brq.mrq); |