diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2013-11-20 00:16:14 -0800 |
|---|---|---|
| committer | Chris Ball <chris@printf.net> | 2014-01-13 12:48:11 -0500 |
| commit | dd006b3081ccf01ee5ef07dcf8ff274626dbf80b (patch) | |
| tree | c400a8ff5cd5216b46dce3fc5f31f335dde975a0 /drivers/mmc | |
| parent | f662ae48ae67dfd42739e65750274fe8de46240a (diff) | |
| download | linux-stable-dd006b3081ccf01ee5ef07dcf8ff274626dbf80b.tar.gz linux-stable-dd006b3081ccf01ee5ef07dcf8ff274626dbf80b.tar.bz2 linux-stable-dd006b3081ccf01ee5ef07dcf8ff274626dbf80b.zip | |
mmc: tmio: don't overwrite caps2
02cb3221d5bb35 ("mmc: tmio: support caps2 flags") added caps2 support on
tmio, but it overwrites mmc_of_parse() settings. This patch fixes it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Laurent <laurent.pinchart@ideasonboard.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/tmio_mmc_pio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c index f3b2d8ca1eca..6c07e70a4a45 100644 --- a/drivers/mmc/host/tmio_mmc_pio.c +++ b/drivers/mmc/host/tmio_mmc_pio.c @@ -1016,7 +1016,7 @@ int tmio_mmc_host_probe(struct tmio_mmc_host **host, mmc->ops = &tmio_mmc_ops; mmc->caps |= MMC_CAP_4_BIT_DATA | pdata->capabilities; - mmc->caps2 = pdata->capabilities2; + mmc->caps2 |= pdata->capabilities2; mmc->max_segs = 32; mmc->max_blk_size = 512; mmc->max_blk_count = (PAGE_CACHE_SIZE / mmc->max_blk_size) * |