From: Kuninori Morimoto Date: Wed, 20 Nov 2013 08:16:14 +0000 (-0800) Subject: mmc: tmio: don't overwrite caps2 X-Git-Tag: next-20140116~50^2~35 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=dd006b3081ccf01ee5ef07dcf8ff274626dbf80b;p=karo-tx-linux.git 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 Acked-by: Laurent Signed-off-by: Chris Ball --- 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) *