ipq806x: refresh 4.19 patches

[openwrt/staging/ynezz.git] / target / linux / ipq806x / patches-4.19 / 0048-PM-OPP-HACK-Allow-to-set-regulator-without-opp_list.patch

diff --git a/target/linux/ipq806x/patches-4.19/0048-PM-OPP-HACK-Allow-to-set-regulator-without-opp_list.patch b/target/linux/ipq806x/patches-4.19/0048-PM-OPP-HACK-Allow-to-set-regulator-without-opp_list.patch
index 7c78d444f80f850ab13d5f2fbb3e5c9cc9a795a8..d415f7b74487e7453a1a345854a03aae4a55d18a 100644 (file)
--- a/target/linux/ipq806x/patches-4.19/0048-PM-OPP-HACK-Allow-to-set-regulator-without-opp_list.patch
+++ b/target/linux/ipq806x/patches-4.19/0048-PM-OPP-HACK-Allow-to-set-regulator-without-opp_list.patch
@@ -8,9 +8,9 @@ Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>
  drivers/base/power/opp/core.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
---- a/drivers/base/power/opp/core.c
-+++ b/drivers/base/power/opp/core.c
-@@ -1280,11 +1280,13 @@ struct opp_table *dev_pm_opp_set_regulat
+--- a/drivers/opp/core.c
++++ b/drivers/opp/core.c
+@@ -1317,11 +1317,13 @@ struct opp_table *dev_pm_opp_set_regulat
        if (!opp_table)
                return ERR_PTR(-ENOMEM);
  
@@ -22,5 +22,5 @@ Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>
        }
 +#endif
  
-       /* Already have regulators set */
-       if (opp_table->regulators) {
+       /* Another CPU that shares the OPP table has set the regulators ? */
+       if (opp_table->regulators)