lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 30 Sep 2014 16:59:38 +0200 From: Matteo Facchinetti <matteo.facchinetti@...ius-es.it> To: chris@...ntf.net, ulf.hansson@...aro.org Cc: shc_work@...l.ru, s.hauer@...gutronix.de, peter.griffin@...aro.org, linux-mmc@...r.kernel.org, linux-kernel@...r.kernel.org, linucppc-dev@...ts.ozlabs.org, agust@...x.de, gsi@...x.de, sbabic@...x.de, Matteo Facchinetti <matteo.facchinetti@...ius-es.it> Subject: [PATCH 2/2] mmc: mxcmmc: fix the default value for available voltages into mxcmci_probe From: Matteo Facchinetti <matteo.facchinetti@...ius-es.it> 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 <matteo.facchinetti@...ius-es.it> --- drivers/mmc/host/mxcmmc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c index 536a898..5350dc5 100644 --- a/drivers/mmc/host/mxcmmc.c +++ b/drivers/mmc/host/mxcmmc.c @@ -1077,13 +1077,13 @@ 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; - else - goto out_free; - } + if (ret == -EPROBE_DEFER) + goto out_free; + + if (pdata && pdata->ocr_avail) + mmc->ocr_avail = pdata->ocr_avail; + else + mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34; if (dat3_card_detect) host->default_irq_mask = -- 1.8.3.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists