summaryrefslogtreecommitdiffstats
path: root/drivers/mmc/mmc_block.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-09 15:08:33 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-09 15:08:33 -0800
commit8e9c238c3884c226f0cddc31cde87dd5df1a6500 (patch)
treed6b4bb2f474580fd6f52e70447f8ed79d441a89d /drivers/mmc/mmc_block.c
parentf17578decc40df8fceff82b106582e30bdfb3189 (diff)
parent7225b3fd0b6e224235fc50a69f70479ff96d5602 (diff)
downloadop-kernel-dev-8e9c238c3884c226f0cddc31cde87dd5df1a6500.zip
op-kernel-dev-8e9c238c3884c226f0cddc31cde87dd5df1a6500.tar.gz
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
Diffstat (limited to 'drivers/mmc/mmc_block.c')
-rw-r--r--drivers/mmc/mmc_block.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/mmc/mmc_block.c b/drivers/mmc/mmc_block.c
index d5f2898..f2c42b1 100644
--- a/drivers/mmc/mmc_block.c
+++ b/drivers/mmc/mmc_block.c
@@ -187,7 +187,13 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
brq.data.flags |= MMC_DATA_WRITE;
brq.data.blocks = 1;
}
- brq.mrq.stop = brq.data.blocks > 1 ? &brq.stop : NULL;
+
+ if (brq.data.blocks > 1) {
+ brq.data.flags |= MMC_DATA_MULTI;
+ brq.mrq.stop = &brq.stop;
+ } else {
+ brq.mrq.stop = NULL;
+ }
brq.data.sg = mq->sg;
brq.data.sg_len = blk_rq_map_sg(req->q, req, brq.data.sg);
OpenPOWER on IntegriCloud