Hi, On Wed, Nov 20 2013, Kuninori Morimoto wrote: > 02cb3221d5bb351ad9f7469453dcca7594a0fabf > (mmc: tmio: support caps2 flags) added caps2 support > on tmio, but it overwrites mmc_of_parse() settings. > This patch fixes it up > > Acked-by: Laurent <laurent.pinchart@xxxxxxxxxxxxxxxx> > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx> > --- >>> Chris > > This was part of "SDHI support for r8a7790" patch-set, > but was separated > > drivers/mmc/host/tmio_mmc_pio.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c > index 99f6d29..1f5f2ba 100644 > --- a/drivers/mmc/host/tmio_mmc_pio.c > +++ b/drivers/mmc/host/tmio_mmc_pio.c > @@ -1021,7 +1021,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) * Thanks, pushed to mmc-next for 3.14. - Chris. -- Chris Ball <cjb@xxxxxxxxxx> <http://printf.net/> -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
