summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-02-23 12:22:18 +0900
committerMark Brown <broonie@linaro.org>2014-02-23 12:22:18 +0900
commitf29d778fa47aacb4b0e7dede603756ac782c9391 (patch)
tree90921ca8e23bfd23f1cfa72335a11b0702d6a9f9
parent6d0abeca3242a88cab8232e4acd7e2bf088f3bc2 (diff)
parentacc3d5cec84f82ebea535fa0bd9500ac3df2aee9 (diff)
downloadlinux-f29d778fa47aacb4b0e7dede603756ac782c9391.tar.bz2
Merge remote-tracking branch 'regulator/fix/core' into regulator-linus
-rw-r--r--drivers/regulator/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 16a309e5c024..d1ac4caaf1b0 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1359,7 +1359,7 @@ static struct regulator *_regulator_get(struct device *dev, const char *id,
goto found;
/* Don't log an error when called from regulator_get_optional() */
} else if (!have_full_constraints() || exclusive) {
- dev_err(dev, "dummy supplies not allowed\n");
+ dev_warn(dev, "dummy supplies not allowed\n");
}
mutex_unlock(&regulator_list_mutex);