Browse Source

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>
Kuninori Morimoto 11 years ago
parent
commit
dd006b3081
1 changed files with 1 additions and 1 deletions
  1. 1 1
      drivers/mmc/host/tmio_mmc_pio.c

+ 1 - 1
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->ops = &tmio_mmc_ops;
 	mmc->caps |= MMC_CAP_4_BIT_DATA | pdata->capabilities;
 	mmc->caps |= MMC_CAP_4_BIT_DATA | pdata->capabilities;
-	mmc->caps2 = pdata->capabilities2;
+	mmc->caps2 |= pdata->capabilities2;
 	mmc->max_segs = 32;
 	mmc->max_segs = 32;
 	mmc->max_blk_size = 512;
 	mmc->max_blk_size = 512;
 	mmc->max_blk_count = (PAGE_CACHE_SIZE / mmc->max_blk_size) *
 	mmc->max_blk_count = (PAGE_CACHE_SIZE / mmc->max_blk_size) *