summaryrefslogtreecommitdiffstats
path: root/drivers/soc
diff options
context:
space:
mode:
authorHeiko Stuebner <heiko@sntech.de>2015-10-15 14:35:01 +0200
committerHeiko Stuebner <heiko@sntech.de>2015-10-16 09:23:59 +0200
commitc3ce5b3768b17120dca852513af211c4acd3d2b0 (patch)
tree17ff308e08ca05659314449a9884f90c5e9378e9 /drivers/soc
parentsoc: rockchip: Restrict to ARCH_ROCKCHIP (diff)
downloadlinux-c3ce5b3768b17120dca852513af211c4acd3d2b0.tar.xz
linux-c3ce5b3768b17120dca852513af211c4acd3d2b0.zip
soc: rockchip: power-domain: don't try to print the clock name in error case
When we never got the the clock-reference, i.e. when IS_ERR(clk) is true, don't try to print the clock name via %pC as this of course produces a null-pointer-dereference in __clk_get_name(). Signed-off-by: Heiko Stuebner <heiko@sntech.de> Reviewed-by: Caesar Wang <wxt@rock-chips.com>
Diffstat (limited to 'drivers/soc')
-rw-r--r--drivers/soc/rockchip/pm_domains.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/soc/rockchip/pm_domains.c b/drivers/soc/rockchip/pm_domains.c
index 8268d5d2b852..534c58937a56 100644
--- a/drivers/soc/rockchip/pm_domains.c
+++ b/drivers/soc/rockchip/pm_domains.c
@@ -265,8 +265,8 @@ static int rockchip_pm_add_one_domain(struct rockchip_pmu *pmu,
if (IS_ERR(clk)) {
error = PTR_ERR(clk);
dev_err(pmu->dev,
- "%s: failed to get clk %pC (index %d): %d\n",
- node->name, clk, i, error);
+ "%s: failed to get clk at index %d: %d\n",
+ node->name, i, error);
goto err_out;
}