aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/pistachio/patches-5.4
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2020-10-31 07:35:12 -0400
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-11-01 14:44:06 +0100
commitb4c02c999894d9af49ba124c1be0079ffb5141f0 (patch)
tree0f7563c3bcc0084989180aa8b0a9e8f0c06689e1 /target/linux/pistachio/patches-5.4
parent5cdc65f6d1f44ab506e67aa266a095c8706f34a7 (diff)
downloadupstream-b4c02c999894d9af49ba124c1be0079ffb5141f0.tar.gz
upstream-b4c02c999894d9af49ba124c1be0079ffb5141f0.tar.bz2
upstream-b4c02c999894d9af49ba124c1be0079ffb5141f0.zip
kernel: bump 5.4 to 5.4.73
Removed upstreamed patches: generic/pending-5.4 445-mtd-spinand-gigadevice-Only-one-dummy-byte-in-QUA.patch 446-mtd-spinand-gigadevice-Add-QE-Bit.patch pistachio/patches-5.4 150-pwm-img-Fix-null-pointer-access-in-probe.patch Manually rebased: layerscape/patches-5.4 801-audio-0011-Revert-ASoC-fsl_sai-add-of_match-data.patch 801-audio-0039-MLK-16224-6-ASoC-fsl_sai-fix-DSD-suspend-resume.patch 801-audio-0073-MLK-21957-3-ASoC-fsl_sai-add-bitcount-and-timestamp-.patch 820-usb-0009-usb-dwc3-Add-workaround-for-host-mode-VBUS-glitch-wh.patch All modifications made by update_kernel.sh Build system: x86_64 Build-tested: ipq806x/R7800, ath79/generic, bcm27xx/bcm2711, mvebu (mamba, rango), x86_64, ramips/mt7621 Run-tested: ipq806x/R7800, mvebu (mamba, rango), x86_64, ramips (RT-AC57U) No dmesg regressions, everything functional Signed-off-by: John Audia <graysky@archlinux.us> [alter 820-usb-0009-usb-dwc3-Add-workaround-for-host-mode-VBUS-glitch-wh] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/pistachio/patches-5.4')
-rw-r--r--target/linux/pistachio/patches-5.4/150-pwm-img-Fix-null-pointer-access-in-probe.patch42
1 files changed, 0 insertions, 42 deletions
diff --git a/target/linux/pistachio/patches-5.4/150-pwm-img-Fix-null-pointer-access-in-probe.patch b/target/linux/pistachio/patches-5.4/150-pwm-img-Fix-null-pointer-access-in-probe.patch
deleted file mode 100644
index d5c573c75c..0000000000
--- a/target/linux/pistachio/patches-5.4/150-pwm-img-Fix-null-pointer-access-in-probe.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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: