Message ID | 1764593.eLkUiZigaK@diego (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Heiko, Thanks to fix it. ? 2015?10?15? 21:22, Heiko Stübner ??: > 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> Look good to me, you can free add that. Reviewed-by: Caesar Wang <wxt@rock-chips.com> > --- > drivers/soc/rockchip/pm_domains.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/soc/rockchip/pm_domains.c b/drivers/soc/rockchip/pm_domains.c > index 8268d5d..534c589 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; > } > > > -- > Thanks, > Caesar
Am Donnerstag, 15. Oktober 2015, 15:22:30 schrieb Heiko Stübner: > 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> applied to my drivers branch with Caesar's Reviewed-tag.
diff --git a/drivers/soc/rockchip/pm_domains.c b/drivers/soc/rockchip/pm_domains.c index 8268d5d..534c589 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; }
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> --- drivers/soc/rockchip/pm_domains.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)