From: Kevin Liu <keyuan.liu@gmail.com>
To: linux-mmc@vger.kernel.org, cjb@laptop.org, pierre@ossman.eu
Cc: hzhuang1@marvell.com, cxie4@marvell.com, prakity@marvell.com,
kliu5@marvell.com, Bin Wang <binw@marvell.com>
Subject: [PATCH 6/6] mmc: sdhci: fix null return check of regulator_get
Date: Wed, 19 Sep 2012 10:12:42 +0800 [thread overview]
Message-ID: <1348020762-12932-7-git-send-email-keyuan.liu@gmail.com> (raw)
In-Reply-To: <1348020762-12932-1-git-send-email-keyuan.liu@gmail.com>
From: Kevin Liu <kliu5@marvell.com>
regulator_get() returns NULL when CONFIG_REGULATOR not defined,
which should be checked.
Signed-off-by: Bin Wang <binw@marvell.com>
Signed-off-by: Kevin Liu <kliu5@marvell.com>
---
drivers/mmc/host/sdhci.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 4b5631e..914147d 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -2845,7 +2845,7 @@ 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)) {
+ if (IS_ERR_OR_NULL(host->vqmmc)) {
pr_info("%s: no vqmmc regulator found\n", mmc_hostname(mmc));
host->vqmmc = NULL;
}
@@ -2912,7 +2912,7 @@ int sdhci_add_host(struct sdhci_host *host)
ocr_avail = 0;
host->vmmc = regulator_get(mmc_dev(mmc), "vmmc");
- if (IS_ERR(host->vmmc)) {
+ if (IS_ERR_OR_NULL(host->vmmc)) {
pr_info("%s: no vmmc regulator found\n", mmc_hostname(mmc));
host->vmmc = NULL;
} else
--
1.7.0.4
next prev parent reply other threads:[~2012-09-19 2:18 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-19 2:12 [PATCH 0/6] mmc: sdhci: fixes and enhancements Kevin Liu
2012-09-19 2:12 ` [PATCH 1/6] mmc: sdhci-pxav3: fix build error Kevin Liu
2012-09-19 2:47 ` Chris Ball
2012-09-19 2:12 ` [PATCH 2/6] mmc: sdhci: fix transfer mode setting bug for cmds w/o data transfer Kevin Liu
2012-09-19 2:12 ` [PATCH 3/6] mmc: sdhci: set regulator min/max voltage according to spec Kevin Liu
2012-09-19 2:12 ` [PATCH 4/6] mmc: sdhci: refine code for sd clock disable/enable in set ios Kevin Liu
2012-09-19 2:12 ` [PATCH 5/6] mmc: sdhci: keep the saved clock var up to date Kevin Liu
2012-09-19 2:12 ` Kevin Liu [this message]
2012-09-19 2:50 ` [PATCH 6/6] mmc: sdhci: fix null return check of regulator_get Chris Ball
2012-09-19 2:53 ` [PATCH 0/6] mmc: sdhci: fixes and enhancements Chris Ball
2012-09-19 7:52 ` Kevin Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1348020762-12932-7-git-send-email-keyuan.liu@gmail.com \
--to=keyuan.liu@gmail.com \
--cc=binw@marvell.com \
--cc=cjb@laptop.org \
--cc=cxie4@marvell.com \
--cc=hzhuang1@marvell.com \
--cc=kliu5@marvell.com \
--cc=linux-mmc@vger.kernel.org \
--cc=pierre@ossman.eu \
--cc=prakity@marvell.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox