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 | c957af0a0f6a2c45b9b3c84f45f4a3aa44d293c6 (patch) | |
| tree | f8e3bda571dab7f80fdd240541ed8bd1d39b179e /target/linux/sunxi/patches-3.13/126-regulator-dont-print-error-when-no-regulator-found.patch | |
| parent | 66543935db1d7eab23fc43b381e56dbd4424b499 (diff) | |
| download | mtk-20170518-c957af0a0f6a2c45b9b3c84f45f4a3aa44d293c6.zip mtk-20170518-c957af0a0f6a2c45b9b3c84f45f4a3aa44d293c6.tar.gz mtk-20170518-c957af0a0f6a2c45b9b3c84f45f4a3aa44d293c6.tar.bz2 | |
sunxi: initial 3.13 support
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
SVN-Revision: 39471
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 0000000..b7952b8 --- /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 + |