mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 14:13:16 +00:00
b4c02c9998
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>
30 lines
973 B
Diff
30 lines
973 B
Diff
From 7316a9e5720c2f4112a96b32c4ec78d94a44adcf Mon Sep 17 00:00:00 2001
|
|
From: popcornmix <popcornmix@gmail.com>
|
|
Date: Tue, 6 Aug 2019 15:23:14 +0100
|
|
Subject: [PATCH] clk-bcm2835: Avoid null pointer exception
|
|
|
|
clk_desc_array[BCM2835_PLLB] doesn't exist so we dereference null when iterating
|
|
|
|
Signed-off-by: popcornmix <popcornmix@gmail.com>
|
|
---
|
|
drivers/clk/bcm/clk-bcm2835.c | 8 +++++---
|
|
1 file changed, 5 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/clk/bcm/clk-bcm2835.c
|
|
+++ b/drivers/clk/bcm/clk-bcm2835.c
|
|
@@ -2280,9 +2280,11 @@ static bool bcm2835_clk_is_claimed(const
|
|
int i;
|
|
|
|
for (i = 0; i < ARRAY_SIZE(clk_desc_array); i++) {
|
|
- const char *clk_name = *(const char **)(clk_desc_array[i].data);
|
|
- if (!strcmp(name, clk_name))
|
|
- return bcm2835_clk_claimed[i];
|
|
+ if (clk_desc_array[i].data) {
|
|
+ const char *clk_name = *(const char **)(clk_desc_array[i].data);
|
|
+ if (!strcmp(name, clk_name))
|
|
+ return bcm2835_clk_claimed[i];
|
|
+ }
|
|
}
|
|
|
|
return false;
|