mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 00:41:17 +00:00
43 lines
1.3 KiB
Diff
43 lines
1.3 KiB
Diff
|
From 502396fe598126ffd91f962d53a507aa6c7276fc Mon Sep 17 00:00:00 2001
|
||
|
|
From: Hauke Mehrtens <hauke@hauke-m.de>
|
||
|
|
Date: Sat, 15 Aug 2020 16:37:43 +0200
|
||
|
|
Subject: [PATCH v2] pwm: img: Fix null pointer access in probe
|
||
|
|
|
||
|
|
dev_get_drvdata() is called in img_pwm_runtime_resume() before the
|
||
|
|
driver data is set.
|
||
|
|
When pm_runtime_enabled() returns false in img_pwm_probe() it calls
|
||
|
|
img_pwm_runtime_resume() which results in a null pointer access.
|
||
|
|
|
||
|
|
This patch fixes the problem by setting the driver data earlier in the
|
||
|
|
img_pwm_probe() function.
|
||
|
|
|
||
|
|
This crash was seen when booting the Imagination Technologies Creator
|
||
|
|
Ci40 (Marduk) with kernel 5.4 in OpenWrt.
|
||
|
|
|
||
|
|
Fixes: e690ae526216 ("pwm: img: Add runtime PM")
|
||
|
|
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
||
|
|
Acked-by: Lee Jones <lee.jones@linaro.org>
|
||
|
|
---
|
||
|
|
drivers/pwm/pwm-img.c | 3 ++-
|
||
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
--- a/drivers/pwm/pwm-img.c
|
||
|
|
+++ b/drivers/pwm/pwm-img.c
|
||
|
|
@@ -277,6 +277,8 @@ static int img_pwm_probe(struct platform
|
||
|
|
return PTR_ERR(pwm->pwm_clk);
|
||
|
|
}
|
||
|
|
|
||
|
|
+ platform_set_drvdata(pdev, pwm);
|
||
|
|
+
|
||
|
|
pm_runtime_set_autosuspend_delay(&pdev->dev, IMG_PWM_PM_TIMEOUT);
|
||
|
|
pm_runtime_use_autosuspend(&pdev->dev);
|
||
|
|
pm_runtime_enable(&pdev->dev);
|
||
|
|
@@ -313,7 +315,6 @@ static int img_pwm_probe(struct platform
|
||
|
|
goto err_suspend;
|
||
|
|
}
|
||
|
|
|
||
|
|
- platform_set_drvdata(pdev, pwm);
|
||
|
|
return 0;
|
||
|
|
|
||
|
|
err_suspend:
|