On Wed, Oct 08, 2014 at 04:24:33PM +0200, Matteo Facchinetti wrote: > From: Matteo Facchinetti <[email protected]> > > If available voltages are not given, mmc_regulator_get_supply() function > returns 0 and mxcmmc driver doesn't set a value for ocr_avail mask. > > In accordance with the comment in platform_data/mmc-mxcmmc.h, > fix it, assuming MMC_VDD_32_33 | MMC_VDD_33_34 as default value. > > Signed-off-by: Matteo Facchinetti <[email protected]>
Looks okay now. Reviewed-by: Sascha Hauer <[email protected]> Sascha > --- > v2: > * Add test to check if mmc->ocr_avail is setted by mmc_regulator_get_supply(). > This will prevent that it be overwritten unconditionally. > --- > drivers/mmc/host/mxcmmc.c | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) > > diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c > index 536a898..5316d9b 100644 > --- a/drivers/mmc/host/mxcmmc.c > +++ b/drivers/mmc/host/mxcmmc.c > @@ -1077,12 +1077,14 @@ static int mxcmci_probe(struct platform_device *pdev) > dat3_card_detect = true; > > ret = mmc_regulator_get_supply(mmc); > - if (ret) { > - if (pdata && ret != -EPROBE_DEFER) > - mmc->ocr_avail = pdata->ocr_avail ? : > - MMC_VDD_32_33 | MMC_VDD_33_34; > + if (ret == -EPROBE_DEFER) > + goto out_free; > + > + if (!mmc->ocr_avail) { > + if (pdata && pdata->ocr_avail) > + mmc->ocr_avail = pdata->ocr_avail; > else > - goto out_free; > + mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34; > } > > if (dat3_card_detect) > -- > 1.8.3.2 > > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
