mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 01:28:59 +00:00
36aa27189a
Deleted upstream patches:
generic:
041-genirq-affinity-Make-affinity-setting-if-activated-o.patch
ipq806x:
093-5-v5.8-ipq806x-PCI-qcom-Define-some-PARF-params-needed-for-ipq8064-SoC.patch
093-6-v5.8-ipq806x-PCI-qcom-Add-support-for-tx-term-offset-for-rev-2_1_0.patch
Merged manually:
ipq806x:
093-4-v5.8-ipq806x-PCI-qcom-Use-bulk-clk-api-and-assert-on-error.patch
layerscape:
804-crypto-0016-MLKU-114-1-crypto-caam-reduce-page-0-regs-access-to-.patch
Build-tested: ath79/generic, ipq806x, layerscape/armv7, layerscape/armv8_64b
Run-tested: ipq806x (R7800)
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
|
|
@@ -2278,9 +2278,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;
|