diff options
| author | Jordan Crouse <jcrouse@codeaurora.org> | 2018-01-22 19:10:45 +0100 |
|---|---|---|
| committer | Rob Clark <robdclark@gmail.com> | 2018-02-20 16:41:22 +0100 |
| commit | 9d20a0e6a8f4edf37d75f3bca41f99f52a440c22 (patch) | |
| tree | f6973d9e446df02bdc5df5fe1e70e328f1fc196b /drivers/gpu/drm/msm | |
| parent | drm/msm: Replace gem_object deprecated functions (diff) | |
| download | linux-9d20a0e6a8f4edf37d75f3bca41f99f52a440c22.tar.xz linux-9d20a0e6a8f4edf37d75f3bca41f99f52a440c22.zip | |
drm/msm/gpu: Set number of clocks to 0 if the list allocation fails
If we fail to allocate gpu->grp_clks reset the number of available
clocks to zero to avoid referencing the missing array later.
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/msm')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_gpu.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index 8078e4d52fe0..1c09acfb4028 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -682,8 +682,10 @@ static int get_clocks(struct platform_device *pdev, struct msm_gpu *gpu) gpu->grp_clks = devm_kcalloc(dev, sizeof(struct clk *), gpu->nr_clocks, GFP_KERNEL); - if (!gpu->grp_clks) + if (!gpu->grp_clks) { + gpu->nr_clocks = 0; return -ENOMEM; + } of_property_for_each_string(dev->of_node, "clock-names", prop, name) { gpu->grp_clks[i] = get_clock(dev, name); |