[v4] pwm: pwm-omap-dmtimer: return -EPROBE_DEFER if no dmtimer platform data

Message ID 20180801141729.2840-1-drivshin@awxrd.com
State Accepted
Headers show
Series
  • [v4] pwm: pwm-omap-dmtimer: return -EPROBE_DEFER if no dmtimer platform data
Related show

Commit Message

David Rivshin Aug. 1, 2018, 2:17 p.m.
From: David Rivshin <DRivshin@allworx.com>

If a pwm-omap-dmtimer is probed before the dmtimer it uses, the platform
data won't be set yet.

Fixes: ac30751df953 ("ARM: OMAP: pdata-quirks: Remove unused timer pdata")
Cc: <stable@vger.kernel.org> # 4.17+
Signed-off-by: David Rivshin <drivshin@allworx.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
Tested-by: Pavel Machek <pavel@ucw.cz>
Acked-by: Ladislav Michl <ladis@linux-mips.org>
Tested-by: Andreas Kemnade <andreas@kemnade.info>
---
Changes in v4:
* Added Ladislav's Acked-by [2]
* Added Andreas's Tested-by [3]
Changes in v3:
* Changed dev_info to dev_dbg
Changes in v2:
* Added Pavel's Acked-by/Tested-by [1]

[1] https://lkml.org/lkml/2018/7/16/346
[2] https://www.spinics.net/lists/arm-kernel/msg668768.html
[3] https://www.spinics.net/lists/arm-kernel/msg669302.html

drivers/pwm/pwm-omap-dmtimer.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


base-commit: acb1872577b346bd15ab3a3f8dff780d6cca4b70

Comments

Thierry Reding Aug. 20, 2018, 9:25 a.m. | #1
On Wed, Aug 01, 2018 at 10:17:29AM -0400, David Rivshin wrote:
> From: David Rivshin <DRivshin@allworx.com>
> 
> If a pwm-omap-dmtimer is probed before the dmtimer it uses, the platform
> data won't be set yet.
> 
> Fixes: ac30751df953 ("ARM: OMAP: pdata-quirks: Remove unused timer pdata")
> Cc: <stable@vger.kernel.org> # 4.17+
> Signed-off-by: David Rivshin <drivshin@allworx.com>
> Acked-by: Pavel Machek <pavel@ucw.cz>
> Tested-by: Pavel Machek <pavel@ucw.cz>
> Acked-by: Ladislav Michl <ladis@linux-mips.org>
> Tested-by: Andreas Kemnade <andreas@kemnade.info>
> ---
> Changes in v4:
> * Added Ladislav's Acked-by [2]
> * Added Andreas's Tested-by [3]
> Changes in v3:
> * Changed dev_info to dev_dbg
> Changes in v2:
> * Added Pavel's Acked-by/Tested-by [1]
> 
> [1] https://lkml.org/lkml/2018/7/16/346
> [2] https://www.spinics.net/lists/arm-kernel/msg668768.html
> [3] https://www.spinics.net/lists/arm-kernel/msg669302.html
> 
> drivers/pwm/pwm-omap-dmtimer.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)

Applied, thanks.

Thierry

Patch

diff --git a/drivers/pwm/pwm-omap-dmtimer.c b/drivers/pwm/pwm-omap-dmtimer.c
index 665da3c8fbceb..f45798679e3c0 100644
--- a/drivers/pwm/pwm-omap-dmtimer.c
+++ b/drivers/pwm/pwm-omap-dmtimer.c
@@ -264,8 +264,9 @@  static int pwm_omap_dmtimer_probe(struct platform_device *pdev)
 
 	timer_pdata = dev_get_platdata(&timer_pdev->dev);
 	if (!timer_pdata) {
-		dev_err(&pdev->dev, "dmtimer pdata structure NULL\n");
-		ret = -EINVAL;
+		dev_dbg(&pdev->dev,
+			 "dmtimer pdata structure NULL, deferring probe\n");
+		ret = -EPROBE_DEFER;
 		goto put;
 	}