Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1741917

[PATCH] ASoC: rockchip: Fix wrong allocation size of dapm routes

Show all headers | View raw

The allocation size of dapm routes is wrong, correct it.

Fixes: d9f9c167edae ("ASoC: rockchip: Init dapm routes dynamically")
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
---

 sound/soc/rockchip/rk3399_gru_sound.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/sound/soc/rockchip/rk3399_gru_sound.c b/sound/soc/rockchip/rk3399_gru_sound.c
index 30eed83e8a13..008452e55ef8 100644
--- a/sound/soc/rockchip/rk3399_gru_sound.c
+++ b/sound/soc/rockchip/rk3399_gru_sound.c
@@ -493,14 +493,18 @@ static int rockchip_sound_of_parse_dais(struct device *dev,
 	struct device_node *np_codec;
 	struct snd_soc_dai_link *dai;
 	struct snd_soc_dapm_route *routes;
-	int i, index;
+	int i, index, max_num_routes;
 
 	card->dai_link = devm_kzalloc(dev, sizeof(rockchip_dais),
 				      GFP_KERNEL);
 	if (!card->dai_link)
 		return -ENOMEM;
 
-	routes = devm_kzalloc(dev, sizeof(rockchip_routes),
+	max_num_routes = 0;
+	for (i = 0; i < ARRAY_SIZE(rockchip_dais); i++)
+		max_num_routes += rockchip_routes[i].num_routes;
+
+	routes = devm_kzalloc(dev, max_num_routes * sizeof(*routes),
 			      GFP_KERNEL);
 	if (!routes)
 		return -ENOMEM;
-- 
2.11.0

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] ASoC: rockchip: Fix wrong allocation size of dapm routes Jeffy Chen <jeffy.chen@rock-chips.com> - 2017-09-29 06:00 +0200
  Re: [PATCH] ASoC: rockchip: Fix wrong allocation size of dapm routes Doug Anderson <dianders@chromium.org> - 2017-10-02 22:50 +0200

csiph-web