git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From dc3de59a16a47f376ed42255deb9b06c4ef32417 Mon Sep 17 00:00:00 2001
   2 From: Sasha Levin <sashal@kernel.org>
   3 Date: Mon, 2 Nov 2020 22:27:27 +0100
   4 Subject: regulator: defer probe when trying to get voltage from unresolved
   5  supply
   6 MIME-Version: 1.0
   7 Content-Type: text/plain; charset=UTF-8
   8 Content-Transfer-Encoding: 8bit
   9
  10 From: Michał Mirosław <mirq-linux@rere.qmqm.pl>
  11
  12 [ Upstream commit cf1ad559a20d1930aa7b47a52f54e1f8718de301 ]
  13
  14 regulator_get_voltage_rdev() is called in regulator probe() when
  15 applying machine constraints.  The "fixed" commit exposed the problem
  16 that non-bypassed regulators can forward the request to its parent
  17 (like bypassed ones) supply. Return -EPROBE_DEFER when the supply
  18 is expected but not resolved yet.
  19
  20 Fixes: aea6cb99703e ("regulator: resolve supply after creating regulator")
  21 Cc: stable@vger.kernel.org
  22 Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
  23 Reported-by: Ondřej Jirman <megous@megous.com>
  24 Reported-by: Corentin Labbe <clabbe.montjoie@gmail.com>
  25 Tested-by: Ondřej Jirman <megous@megous.com>
  26 Link: https://lore.kernel.org/r/a9041d68b4d35e4a2dd71629c8a6422662acb5ee.1604351936.git.mirq-linux@rere.qmqm.pl
  27 Signed-off-by: Mark Brown <broonie@kernel.org>
  28 Signed-off-by: Sasha Levin <sashal@kernel.org>
  29 ---
  30  drivers/regulator/core.c | 2 ++
  31  1 file changed, 2 insertions(+)
  32
  33 diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
  34 index 0f730e4bf6bcb..0caf751d85ded 100644
  35 --- a/drivers/regulator/core.c
  36 +++ b/drivers/regulator/core.c
  37 @@ -3185,6 +3185,8 @@ static int _regulator_get_voltage(struct regulator_dev *rdev)
  38                 ret = rdev->desc->fixed_uV;
  39         } else if (rdev->supply) {
  40                 ret = _regulator_get_voltage(rdev->supply->rdev);
  41 +       } else if (rdev->supply_name) {
  42 +               return -EPROBE_DEFER;
  43         } else {
  44                 return -EINVAL;
  45         }
  46 --
  47 2.27.0
  48