Skip to contentSkip to conversation

clk: clk-st: Add missed return value checks in st_clk_probe()

PATCH New Chuhong Yuan 1 participant 1 message Jun 5, 2020 Common clk

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 clk: clk-st: Add missed return value checks in st_clk_probe()

Return values were not checked after calls of the following functions.
- clk_hw_register_mux
- clk_hw_register_gate
- devm_clk_hw_register_clkdev

Thus add error detection and the corresponding exception handling.

Return the value from the function call "devm_clk_hw_register_clkdev" at the end of this function implementation.

Fixes 421bf6a1f061 ("clk: x86: Add ST oscout platform clock")

---
Changes in v2:
- Modify description.

 drivers/clk/x86/clk-st.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/clk/x86/clk-st.c +7 -3
index 25d4b97aff9b..e6ee6ea2568b 100644
@@ -46,16 +46,20 @@ static int st_clk_probe(struct platform_device *pdev)
 		clk_oscout1_parents, ARRAY_SIZE(clk_oscout1_parents),
 		0, st_data->base + CLKDRVSTR2, OSCOUT1CLK25MHZ, 3, 0, NULL);
 
+	if (IS_ERR(hws[ST_CLK_MUX]))
+		return PTR_ERR(hws[ST_CLK_MUX]);
+
 	clk_set_parent(hws[ST_CLK_MUX]->clk, hws[ST_CLK_48M]->clk);
 
 	hws[ST_CLK_GATE] = clk_hw_register_gate(NULL, "oscout1", "oscout1_mux",
 		0, st_data->base + MISCCLKCNTL1, OSCCLKENB,
 		CLK_GATE_SET_TO_DISABLE, NULL);
 
-	devm_clk_hw_register_clkdev(&pdev->dev, hws[ST_CLK_GATE], "oscout1",
-				    NULL);
+	if (IS_ERR(hws[ST_CLK_GATE]))
+		return PTR_ERR(hws[ST_CLK_GATE]);
 
-	return 0;
+	return devm_clk_hw_register_clkdev(&pdev->dev, hws[ST_CLK_GATE],
+					   "oscout1", NULL);
 }
 
 static int st_clk_remove(struct platform_device *pdev)
Signature · 1 line
2.26.2