linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: broonie@kernel.org (Mark Brown)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/5] mmc: core: Indicate that vmmcq may be absent
Date: Tue, 30 Jul 2013 12:46:14 +0100	[thread overview]
Message-ID: <1375184777-25404-2-git-send-email-broonie@kernel.org> (raw)
In-Reply-To: <1375184777-25404-1-git-send-email-broonie@kernel.org>

From: Mark Brown <broonie@linaro.org>

Use regulator_get_optional() to tell the core that requests for the vmmcq
regulator can fail in a real system.

Signed-off-by: Mark Brown <broonie@linaro.org>
---
 drivers/mmc/core/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 49a5bca..5d08855 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1313,7 +1313,7 @@ int mmc_regulator_get_supply(struct mmc_host *mmc)
 
 	supply = devm_regulator_get(dev, "vmmc");
 	mmc->supply.vmmc = supply;
-	mmc->supply.vqmmc = devm_regulator_get(dev, "vqmmc");
+	mmc->supply.vqmmc = devm_regulator_get_optional(dev, "vqmmc");
 
 	if (IS_ERR(supply))
 		return PTR_ERR(supply);
-- 
1.8.3.2

  reply	other threads:[~2013-07-30 11:46 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-30 11:46 [PATCH 1/5] regulator: core: Provide hints to the core about optional supplies Mark Brown
2013-07-30 11:46 ` Mark Brown [this message]
2013-07-30 11:46 ` [PATCH 3/5] mmc: sdhci: Indicate that regulators may be absent Mark Brown
2013-07-30 11:46 ` [PATCH 4/5] mmc: dw_mmc: " Mark Brown
2013-07-30 13:33   ` Seungwon Jeon
2013-07-31  3:29     ` Jaehoon Chung
2013-07-30 11:46 ` [PATCH 5/5] mmc: pxamci: " Mark Brown

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=1375184777-25404-2-git-send-email-broonie@kernel.org \
    --to=broonie@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    /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;
as well as URLs for NNTP newsgroup(s).