From patchwork Fri Sep 29 03:52:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeffy Chen X-Patchwork-Id: 9977083 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 18EE66037F for ; Fri, 29 Sep 2017 03:53:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0AE742918D for ; Fri, 29 Sep 2017 03:53:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F3AED29293; Fri, 29 Sep 2017 03:53:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EB294291DD for ; Fri, 29 Sep 2017 03:53:23 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 4E4A6267446; Fri, 29 Sep 2017 05:53:20 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 0CB28267447; Fri, 29 Sep 2017 05:53:19 +0200 (CEST) Received: from regular1.263xmail.com (regular1.263xmail.com [211.150.99.130]) by alsa0.perex.cz (Postfix) with ESMTP id C524126737C for ; Fri, 29 Sep 2017 05:53:12 +0200 (CEST) Received: from jeffy.chen?rock-chips.com (unknown [192.168.167.234]) by regular1.263xmail.com (Postfix) with ESMTP id C5739B1F4; Fri, 29 Sep 2017 11:53:08 +0800 (CST) X-263anti-spam: KSV:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 4 Received: from localhost (localhost [127.0.0.1]) by smtp.263.net (Postfix) with ESMTPA id E7D3B36B; Fri, 29 Sep 2017 11:52:53 +0800 (CST) X-RL-SENDER: jeffy.chen@rock-chips.com X-FST-TO: linux-kernel@vger.kernel.org X-SENDER-IP: 103.29.142.67 X-LOGIN-NAME: jeffy.chen@rock-chips.com X-UNIQUE-TAG: <4c22d2ba0920cd2c1c8292bc30b37620> X-ATTACHMENT-NUM: 0 X-SENDER: cjf@rock-chips.com X-DNS-TYPE: 0 Received: from localhost (unknown [103.29.142.67]) by smtp.263.net (Postfix) whith ESMTP id 16484Q9IFCP; Fri, 29 Sep 2017 11:52:59 +0800 (CST) From: Jeffy Chen To: linux-kernel@vger.kernel.org Date: Fri, 29 Sep 2017 11:52:52 +0800 Message-Id: <20170929035252.19808-1-jeffy.chen@rock-chips.com> X-Mailer: git-send-email 2.11.0 Cc: alsa-devel@alsa-project.org, Heiko Stuebner , Liam Girdwood , Jeffy Chen , Takashi Iwai , linux-rockchip@lists.infradead.org, Mark Brown , linux-arm-kernel@lists.infradead.org Subject: [alsa-devel] [PATCH] ASoC: rockchip: Fix wrong allocation size of dapm routes X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP The allocation size of dapm routes is wrong, correct it. Fixes: d9f9c167edae ("ASoC: rockchip: Init dapm routes dynamically") Signed-off-by: Jeffy Chen --- 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;