clk: clk-rp1: Don't crash on duplicate clocks

When using DTBs that don't match the kernel version, it's possible for clock registration to fail. Handle that failure, in the hope that the system can continue to boot, with a suitable error message. Link: #6321 Signed-off-by: Phil Elwell <[email protected]>
raspberrypi · Sep 26, 2024 · a30159d · a30159d
1 parent 5f1295e
commit a30159d
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/drivers/clk/clk-rp1.c b/drivers/clk/clk-rp1.c
@@ -2454,6 +2454,11 @@ static int rp1_clk_probe(struct platform_device *pdev)
 		desc = &clk_desc_array[i];
 		if (desc->clk_register && desc->data) {
 			hws[i] = desc->clk_register(clockman, desc->data);
+			if (IS_ERR_OR_NULL(hws[i])) {
+				pr_err("Failed to register RP1 clock '%s' (%ld) - wrong dtbs?\n", *(char **)desc->data, PTR_ERR(hws[i]));
+				hws[i] = NULL;
+				continue;
+			}
 			if (!strcmp(clk_hw_get_name(hws[i]), "clk_i2s")) {
 				clk_i2s = hws[i];
 				clk_xosc = clk_hw_get_parent_by_index(clk_i2s, 0);