The rtc device node is always or at the very least can possibly be NULL.

Since v5.12-rc1-dontuse/3c9ea42802a1fbf7ef29660ff8c6e526c58114f6 this
will lead to a NULL pointer dereference.

To fix this we fallback to using the parent node which is the i2c client
node as set by devm_rtc_allocate_device().

Using the i2c client node seems to be what other similar drivers do
e.g. rtc-pcf8563.c.

Signed-off-by: Francois Gervais <fgerv...@distech-controls.com>
---
 drivers/rtc/rtc-pcf85063.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/rtc/rtc-pcf85063.c b/drivers/rtc/rtc-pcf85063.c
index aef6c1ee8bb0..463991c74fdd 100644
--- a/drivers/rtc/rtc-pcf85063.c
+++ b/drivers/rtc/rtc-pcf85063.c
@@ -478,6 +478,7 @@ static struct clk *pcf85063_clkout_register_clk(struct 
pcf85063 *pcf85063)
 {
        struct clk *clk;
        struct clk_init_data init;
+       struct device_node *node = pcf85063->rtc->dev.of_node;
 
        init.name = "pcf85063-clkout";
        init.ops = &pcf85063_clkout_ops;
@@ -486,16 +487,17 @@ static struct clk *pcf85063_clkout_register_clk(struct 
pcf85063 *pcf85063)
        init.num_parents = 0;
        pcf85063->clkout_hw.init = &init;
 
+       if (node == NULL)
+               node = pcf85063->rtc->dev.parent->of_node;
+
        /* optional override of the clockname */
-       of_property_read_string(pcf85063->rtc->dev.of_node,
-                               "clock-output-names", &init.name);
+       of_property_read_string(node, "clock-output-names", &init.name);
 
        /* register the clock */
        clk = devm_clk_register(&pcf85063->rtc->dev, &pcf85063->clkout_hw);
 
        if (!IS_ERR(clk))
-               of_clk_add_provider(pcf85063->rtc->dev.of_node,
-                                   of_clk_src_simple_get, clk);
+               of_clk_add_provider(node, of_clk_src_simple_get, clk);
 
        return clk;
 }
-- 
2.17.1

Reply via email to