From 64ee7e84b3cc2f300949322cb346b96c45c8a290 Mon Sep 17 00:00:00 2001 From: Satya Rama Aditya Pinapala Date: Fri, 31 Jan 2020 16:41:55 -0800 Subject: [PATCH] disp: msm: dsi: call pll set rate directly instead of a function pointer cb The clock framework nulls the clock hardware init data, after a variant of clk_register is called on the clk_hw pointer. This results in a null pointer dereference when we try to call set rate in the PLL prepare function. The call can be a direct call to the function rather than trying to access through the init_data pointer of the clk_hw. Change-Id: I3613eea915d4f5620d7f0258ae391ad2ac624148 Signed-off-by: Satya Rama Aditya Pinapala --- msm/dsi/dsi_pll_5nm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/msm/dsi/dsi_pll_5nm.c b/msm/dsi/dsi_pll_5nm.c index 271eb76ef732..de15eebbe7ca 100644 --- a/msm/dsi/dsi_pll_5nm.c +++ b/msm/dsi/dsi_pll_5nm.c @@ -1391,7 +1391,7 @@ static int vco_5nm_prepare(struct clk_hw *hw) if ((pll->vco_cached_rate != 0) && (pll->vco_cached_rate == clk_hw_get_rate(hw))) { - rc = hw->init->ops->set_rate(hw, pll->vco_cached_rate, + rc = vco_5nm_set_rate(hw, pll->vco_cached_rate, pll->vco_cached_rate); if (rc) { pr_err("pll(%d) set_rate failed, rc=%d\n",