Merge master.kernel.org:/home/rmk/linux-2.6-mmc
[linux-2.6.git] / drivers / mmc / mmc_block.c
index d5f28981596b3e6ab5df1d63795e53cc3fb62d98..f2c42b13945d9bc4b0d13b8d7159c7e65abc174b 100644 (file)
@@ -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);