From: Greg Kroah-Hartman Date: Tue, 15 Jun 2021 10:24:18 +0000 (+0200) Subject: drop queue-4.9/regulator-core-resolve-supply-for-boot-on-always-on-regulators.patch X-Git-Tag: v4.4.273~9 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=76d3cf6a379ea6007a6ffcbeb39b5159a383f5ab;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-4.9/regulator-core-resolve-supply-for-boot-on-always-on-regulators.patch --- diff --git a/queue-4.9/regulator-core-resolve-supply-for-boot-on-always-on-regulators.patch b/queue-4.9/regulator-core-resolve-supply-for-boot-on-always-on-regulators.patch deleted file mode 100644 index d96fce88c0c..00000000000 --- a/queue-4.9/regulator-core-resolve-supply-for-boot-on-always-on-regulators.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 98e48cd9283dbac0e1445ee780889f10b3d1db6a Mon Sep 17 00:00:00 2001 -From: Dmitry Baryshkov -Date: Thu, 20 May 2021 01:12:23 +0300 -Subject: regulator: core: resolve supply for boot-on/always-on regulators - -From: Dmitry Baryshkov - -commit 98e48cd9283dbac0e1445ee780889f10b3d1db6a upstream. - -For the boot-on/always-on regulators the set_machine_constrainst() is -called before resolving rdev->supply. Thus the code would try to enable -rdev before enabling supplying regulator. Enforce resolving supply -regulator before enabling rdev. - -Fixes: aea6cb99703e ("regulator: resolve supply after creating regulator") -Signed-off-by: Dmitry Baryshkov -Link: https://lore.kernel.org/r/20210519221224.2868496-1-dmitry.baryshkov@linaro.org -Signed-off-by: Mark Brown -Signed-off-by: Greg Kroah-Hartman ---- - drivers/regulator/core.c | 6 ++++++ - 1 file changed, 6 insertions(+) - ---- a/drivers/regulator/core.c -+++ b/drivers/regulator/core.c -@@ -1080,6 +1080,12 @@ static int set_machine_constraints(struc - * and we have control then make sure it is enabled. - */ - if (rdev->constraints->always_on || rdev->constraints->boot_on) { -+ /* If we want to enable this regulator, make sure that we know -+ * the supplying regulator. -+ */ -+ if (rdev->supply_name && !rdev->supply) -+ return -EPROBE_DEFER; -+ - ret = _regulator_do_enable(rdev); - if (ret < 0 && ret != -EINVAL) { - rdev_err(rdev, "failed to enable\n"); diff --git a/queue-4.9/series b/queue-4.9/series index 9fc12b8bd80..f39ec9e72b3 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -30,7 +30,6 @@ usb-serial-quatech2-fix-control-request-directions.patch usb-gadget-eem-fix-wrong-eem-header-operation.patch usb-fix-various-gadgets-null-ptr-deref-on-10gbps-cabling.patch usb-fix-various-gadget-panics-on-10gbps-cabling.patch -regulator-core-resolve-supply-for-boot-on-always-on-regulators.patch perf-fix-data-race-between-pin_count-increment-decrement.patch nfs-fix-a-potential-null-dereference-in-nfs_get_clie.patch perf-session-correct-buffer-copying-when-peeking-eve.patch