diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 09:30:55 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 09:30:55 -0400 |
| commit | 29ea35969b92a4be122a58c4aceea8c5e2c388d9 (patch) | |
| tree | 8285c0e98e7bb03868d390b58180e3cab876a8db /drivers/mmc | |
| parent | 112d17d6f75b93e1dcaec2e2232a411148b3bf71 (diff) | |
| parent | b4cbb8a4e602ea77b0525d06eff89c6a6070dab3 (diff) | |
Merge branch 'imx/devel' into next/devel
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/card/block.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index 1ff5486213fb..4c1a648d00fc 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c | |||
| @@ -926,6 +926,9 @@ static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq, | |||
| 926 | /* | 926 | /* |
| 927 | * Reliable writes are used to implement Forced Unit Access and | 927 | * Reliable writes are used to implement Forced Unit Access and |
| 928 | * REQ_META accesses, and are supported only on MMCs. | 928 | * REQ_META accesses, and are supported only on MMCs. |
| 929 | * | ||
| 930 | * XXX: this really needs a good explanation of why REQ_META | ||
| 931 | * is treated special. | ||
| 929 | */ | 932 | */ |
| 930 | bool do_rel_wr = ((req->cmd_flags & REQ_FUA) || | 933 | bool do_rel_wr = ((req->cmd_flags & REQ_FUA) || |
| 931 | (req->cmd_flags & REQ_META)) && | 934 | (req->cmd_flags & REQ_META)) && |