Updated Haojian and Philip's mail address.
2012/11/12 Kevin Liu <[email protected]>: > 2012/11/5 Chris Ball <[email protected]>: >> Hi, >> >> On Wed, Oct 17 2012, Kevin Liu wrote: >>> From: Kevin Liu <[email protected]> >>> >>> regulator_get() returns NULL when CONFIG_REGULATOR not defined, >>> which should not print out the warning. >>> >>> Reviewed-by: Philip Rakity <[email protected]> >>> Signed-off-by: Bin Wang <[email protected]> >>> Signed-off-by: Kevin Liu <[email protected]> >>> --- >>> drivers/mmc/host/sdhci.c | 18 ++++++++++++------ >>> 1 files changed, 12 insertions(+), 6 deletions(-) >>> >>> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c >>> index 8e6a6f0..0104ae9 100644 >>> --- a/drivers/mmc/host/sdhci.c >>> +++ b/drivers/mmc/host/sdhci.c >>> @@ -2845,9 +2845,12 @@ int sdhci_add_host(struct sdhci_host *host) >>> >>> /* If vqmmc regulator and no 1.8V signalling, then there's no UHS */ >>> host->vqmmc = regulator_get(mmc_dev(mmc), "vqmmc"); >>> - if (IS_ERR(host->vqmmc)) { >>> - pr_info("%s: no vqmmc regulator found\n", mmc_hostname(mmc)); >>> - host->vqmmc = NULL; >>> + if (IS_ERR_OR_NULL(host->vqmmc)) { >>> + if (PTR_ERR(host->vqmmc) < 0) { >>> + pr_info("%s: no vqmmc regulator found\n", >>> + mmc_hostname(mmc)); >>> + host->vqmmc = NULL; >>> + } >>> } >>> else if (regulator_is_supported_voltage(host->vqmmc, 1800000, >>> 1800000)) >>> regulator_enable(host->vqmmc); >>> @@ -2903,9 +2906,12 @@ int sdhci_add_host(struct sdhci_host *host) >>> ocr_avail = 0; >>> >>> host->vmmc = regulator_get(mmc_dev(mmc), "vmmc"); >>> - if (IS_ERR(host->vmmc)) { >>> - pr_info("%s: no vmmc regulator found\n", mmc_hostname(mmc)); >>> - host->vmmc = NULL; >>> + if (IS_ERR_OR_NULL(host->vmmc)) { >>> + if (PTR_ERR(host->vmmc) < 0) { >>> + pr_info("%s: no vmmc regulator found\n", >>> + mmc_hostname(mmc)); >>> + host->vmmc = NULL; >>> + } >>> } else >>> regulator_enable(host->vmmc); >> >> Pushed to mmc-next for 3.7 with this commit message: >> > > Chris, > > Thanks for the push. > But how about the other 13 patches in the same patchset ([PATCH v6 > 00/14] mmc: sdhci: mmc: sdhci: fixes and enhancements)? > Most of them also aim to fix bugs. > > Kevin -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
