diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-21 15:51:33 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-21 15:51:33 +0200 |
| commit | 026b0e49879529dcaf198efcf49ccec280fedfa0 (patch) | |
| tree | 7e2788fa485cb8ea57f00d7dd62bc87de023be0f /regulator-pwm-Don-t-warn-on-probe-deferral.patch | |
| parent | 8751e34793a6ea7d373d81439c3e3b6a4d227ef3 (diff) | |
| parent | 71893eb2f68d8dd59d462be73e9832ccb4ccfe9d (diff) | |
| download | kernel-026b0e49879529dcaf198efcf49ccec280fedfa0.tar.gz kernel-026b0e49879529dcaf198efcf49ccec280fedfa0.tar.xz kernel-026b0e49879529dcaf198efcf49ccec280fedfa0.zip | |
Merge remote-tracking branch 'origin/f31' into f31-user-thl-vanilla-fedorakernel-5.6.6-250.vanilla.knurd.1.fc31
Diffstat (limited to 'regulator-pwm-Don-t-warn-on-probe-deferral.patch')
| -rw-r--r-- | regulator-pwm-Don-t-warn-on-probe-deferral.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/regulator-pwm-Don-t-warn-on-probe-deferral.patch b/regulator-pwm-Don-t-warn-on-probe-deferral.patch new file mode 100644 index 000000000..cebfae9de --- /dev/null +++ b/regulator-pwm-Don-t-warn-on-probe-deferral.patch @@ -0,0 +1,36 @@ +From 0cd71b9a43ad80f4d9a8bfde6ec6db8daf447029 Mon Sep 17 00:00:00 2001 +From: Jon Hunter <jonathanh@nvidia.com> +Date: Mon, 2 Mar 2020 14:14:28 +0000 +Subject: regulator: pwm: Don't warn on probe deferral + +Deferred probe is an expected return value for devm_pwm_get(). Given +that the driver deals with it properly, rather than warn on probe +deferral, only output a message on probe deferral if debug level +prints are enabled. + +Signed-off-by: Jon Hunter <jonathanh@nvidia.com> +Link: https://lore.kernel.org/r/20200302141428.14119-1-jonathanh@nvidia.com +Signed-off-by: Mark Brown <broonie@kernel.org> +--- + drivers/regulator/pwm-regulator.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/drivers/regulator/pwm-regulator.c b/drivers/regulator/pwm-regulator.c +index e74e11101fc1..638329bd0745 100644 +--- a/drivers/regulator/pwm-regulator.c ++++ b/drivers/regulator/pwm-regulator.c +@@ -354,7 +354,11 @@ static int pwm_regulator_probe(struct platform_device *pdev) + drvdata->pwm = devm_pwm_get(&pdev->dev, NULL); + if (IS_ERR(drvdata->pwm)) { + ret = PTR_ERR(drvdata->pwm); +- dev_err(&pdev->dev, "Failed to get PWM: %d\n", ret); ++ if (ret == -EPROBE_DEFER) ++ dev_dbg(&pdev->dev, ++ "Failed to get PWM, deferring probe\n"); ++ else ++ dev_err(&pdev->dev, "Failed to get PWM: %d\n", ret); + return ret; + } + +-- +cgit 1.2-0.3.lf.el7 |