diff options
| author | Gustavo A. R. Silva <gustavo@embeddedor.com> | 2018-12-23 23:50:58 -0600 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2019-01-09 10:37:01 -0800 |
| commit | 4f340efcb21220b7a0afcea3884e66f79e6f2306 (patch) | |
| tree | 1ca057f607ae723bee9f58d485d445e9c9316de3 /drivers | |
| parent | d39eca547f3ec67140a5d765a426eb157b978a59 (diff) | |
| download | blackbird-op-linux-4f340efcb21220b7a0afcea3884e66f79e6f2306.tar.gz blackbird-op-linux-4f340efcb21220b7a0afcea3884e66f79e6f2306.zip | |
clk: zynqmp: Fix memory allocation in zynqmp_clk_setup
Fix memory allocation and use struct_size() in kzalloc(). This also
fixes the allocation size to be correct, and smaller, because before we
were allocating a bunch of sizeof(struct clk_hw_onecell_data) structures
for each struct clk_hw we needed.
Fixes: 3fde0e16d016 ("drivers: clk: Add ZynqMP clock driver")
Cc: stable@vger.kernel.org
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Acked-by: Michal Simek <michal.simek@xilinx.com>
[sboyd@kernel.org: Expand commit text]
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/clk/zynqmp/clkc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/zynqmp/clkc.c b/drivers/clk/zynqmp/clkc.c index f65cc0ff76ab..b0908ec62f73 100644 --- a/drivers/clk/zynqmp/clkc.c +++ b/drivers/clk/zynqmp/clkc.c @@ -669,8 +669,8 @@ static int zynqmp_clk_setup(struct device_node *np) if (ret) return ret; - zynqmp_data = kzalloc(sizeof(*zynqmp_data) + sizeof(*zynqmp_data) * - clock_max_idx, GFP_KERNEL); + zynqmp_data = kzalloc(struct_size(zynqmp_data, hws, clock_max_idx), + GFP_KERNEL); if (!zynqmp_data) return -ENOMEM; |
