diff options
author | Zoltan HERPAI <wigyori@uid0.hu> | 2014-02-05 08:42:28 +0000 |
---|---|---|
committer | Zoltan HERPAI <wigyori@uid0.hu> | 2014-02-05 08:42:28 +0000 |
commit | d1ca9d207acc1056bd460f7cba2f50af87004f58 (patch) | |
tree | 3ec56a328c48048eb595e971cf2f7f51e73404ed /target/linux/sunxi/patches-3.13/126-regulator-dont-print-error-when-no-regulator-found.patch | |
parent | 1dd76f71e1aa7e8dae83aed641ac527ac4f8fadd (diff) | |
download | upstream-d1ca9d207acc1056bd460f7cba2f50af87004f58.tar.gz upstream-d1ca9d207acc1056bd460f7cba2f50af87004f58.tar.bz2 upstream-d1ca9d207acc1056bd460f7cba2f50af87004f58.zip |
sunxi: initial 3.13 support
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39471 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/sunxi/patches-3.13/126-regulator-dont-print-error-when-no-regulator-found.patch')
-rw-r--r-- | target/linux/sunxi/patches-3.13/126-regulator-dont-print-error-when-no-regulator-found.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/target/linux/sunxi/patches-3.13/126-regulator-dont-print-error-when-no-regulator-found.patch b/target/linux/sunxi/patches-3.13/126-regulator-dont-print-error-when-no-regulator-found.patch new file mode 100644 index 0000000000..b7952b8484 --- /dev/null +++ b/target/linux/sunxi/patches-3.13/126-regulator-dont-print-error-when-no-regulator-found.patch @@ -0,0 +1,34 @@ +From 820a121fdef79cc1293e6fee2fbe8156d9e8a75a Mon Sep 17 00:00:00 2001 +From: Hans de Goede <hdegoede@redhat.com> +Date: Wed, 11 Dec 2013 15:07:52 +0100 +Subject: [PATCH] regulator_get_optional: don't print an error when no + regulator is found + +Only print an error when _regulator_get() is expected to return a valid +regulator, that is when _regulator_get() is called from regulator_get() and +we're not using the dummy because we don't have full-constraints, or when +_regulator_get() is called from regulator_get_exclusive() in which case +returning a dummy is not allowed. + +Signed-off-by: Hans de Goede <hdegoede@redhat.com> +--- + drivers/regulator/core.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c +index d85f313..9888f26 100644 +--- a/drivers/regulator/core.c ++++ b/drivers/regulator/core.c +@@ -1351,7 +1351,8 @@ static struct regulator *_regulator_get(struct device *dev, const char *id, + + rdev = dummy_regulator_rdev; + goto found; +- } else { ++ /* 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"); + } + +-- +1.8.5.1 + |