On Mon, Oct 21, 2013 at 10:27:05PM +0800, Dong Aisheng wrote: > We should use '|=' instead '=', or it may over write > the original caps assigned before this line. > > Signed-off-by: Dong Aisheng <b29396@xxxxxxxxxxxxx> > --- > drivers/mmc/host/sdhci-esdhc-imx.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c > index 5fe484f..baa27c7 100644 > --- a/drivers/mmc/host/sdhci-esdhc-imx.c > +++ b/drivers/mmc/host/sdhci-esdhc-imx.c > @@ -1070,7 +1070,7 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev) > break; > > case ESDHC_CD_PERMANENT: > - host->mmc->caps = MMC_CAP_NONREMOVABLE; > + host->mmc->caps |= MMC_CAP_NONREMOVABLE; I think it will be more logical if you switch the order of this patch and the previous one. Shawn > break; > > case ESDHC_CD_NONE: > -- > 1.7.2.rc3 > > -- 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
