From: Sean Paul seanpaul@chromium.org
This patch fixes the following error:
drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c:425:11: error: variable 'parent_name' is uninitialized when used here [-Werror,-Wuninitialized] snprintf(parent_name, 32, "dsi%dvco_clk", pll_28nm->phy->id); ^~~~~~~~~~~ drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c:385:30: note: initialize the variable 'parent_name' to silence this warning char *clk_name, *parent_name, *vco_name; ^ = NULL 1 error generated. make[5]: *** [scripts/Makefile.build:279: drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.o] Error 1
It looks like the allocation was inadvertently deleted.
Fixes: 5d13459650b3 ("drm/msm/dsi: push provided clocks handling into a generic code")
Cc: Dmitry Baryshkov dmitry.baryshkov@linaro.org Cc: Stephen Boyd swboyd@chromium.org Cc: Abhinav Kumar abhinavk@codeaurora.org Cc: Rob Clark robdclark@chromium.org Signed-off-by: Sean Paul seanpaul@chromium.org --- drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c index 582b1428f971..86e40a0d41a3 100644 --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c @@ -405,6 +405,10 @@ static int pll_28nm_register(struct dsi_pll_28nm *pll_28nm, struct clk_hw **prov if (!vco_name) return -ENOMEM;
+ parent_name = devm_kzalloc(dev, 32, GFP_KERNEL); + if (!parent_name) + return -ENOMEM; + clk_name = devm_kzalloc(dev, 32, GFP_KERNEL); if (!clk_name) return -ENOMEM;