mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 17:18:59 +00:00
7d7aa2fd92
This change makes the names of Broadcom targets consistent by using the common notation based on SoC/CPU ID (which is used internally anyway), bcmXXXX instead of brcmXXXX. This is even used for target TITLE in make menuconfig already, only the short target name used brcm so far. Despite, since subtargets range from bcm2708 to bcm2711, it seems appropriate to use bcm27xx instead of bcm2708 (again, as already done for BOARDNAME). This also renames the packages brcm2708-userland and brcm2708-gpu-fw. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Acked-by: Álvaro Fernández Rojas <noltari@gmail.com>
30 lines
973 B
Diff
30 lines
973 B
Diff
From 5b8a217fe818bc038592b8a5284ba0c18948fabf 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
|
|
@@ -2288,9 +2288,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;
|