From b61011ada5ff9f323b8a1795211139c290cbf693 Mon Sep 17 00:00:00 2001 From: David Collins Date: Fri, 3 Aug 2018 16:45:49 -0700 Subject: [PATCH] clk: qcom: clk-aop-qmp: use correct name pointer before clock registration clk_aop_qmp_prepare() is called from aop_qmp_clk_probe() before devm_clk_register() is called. This means that clock hw->core pointers are NULL and clk_hw_get_name(hw) triggers a NULL pointer dereference. Use hw->init->name instead of clk_hw_get_name(hw) to avoid the NULL pointer dereference. Change-Id: I548df6518053260d44227adc0479b1ea52a81fc9 Signed-off-by: David Collins --- drivers/clk/qcom/clk-aop-qmp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/clk/qcom/clk-aop-qmp.c b/drivers/clk/qcom/clk-aop-qmp.c index ea6c8a4f93ca..3d69dc945003 100644 --- a/drivers/clk/qcom/clk-aop-qmp.c +++ b/drivers/clk/qcom/clk-aop-qmp.c @@ -149,7 +149,8 @@ static int clk_aop_qmp_prepare(struct clk_hw *hw) ret = mbox_send_message(clk->mbox, &pkt); if (ret < 0) { pr_err("Failed to send clk prepare request for %s, ret %d\n", - clk_hw_get_name(hw), ret); + hw->core ? clk_hw_get_name(hw) : hw->init->name, + ret); goto err; }