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: 9977085 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 9E5BE60365 for ; Fri, 29 Sep 2017 03:54:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8DC86237A5 for ; Fri, 29 Sep 2017 03:54:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 80BE127B13; Fri, 29 Sep 2017 03:54:01 +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=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5704F237A5 for ; Fri, 29 Sep 2017 03:53:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=tNqNDbYdsnpQITf4iJqHNox2WQYQjJHUPpWTWw3D9B0=; b=E6Q NPS1EgsIIe4UFr+Rzchl0dpSNFnauz3SAwxfNPjnn/1mePNZrMeyx0kjlvAD1/RJNn3s6b6BFejNf ul47fWp8zDaa3Domhi5+zpAg7ng+afccLZQkNRSDnvRofHpOmeOm9JyEgltwKzOMGGITxn7DVaVWz 9WB1qeShM4rl6L1weFULhxe+bse9feXHX+nIC5AHWooMiLxdxDOIayeKShona50/0zF1ZXG+BZGpg CvJ5V3EtTye0YFHNtp2eSEreUNOM7cIbalk1UknueLugEIWsdkqhr97HRngvaXEGevBTQuUTyblmv FpCInCxuMLRnQY839JhCXLouCL4WWdw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dxmN6-0002Om-Ho; Fri, 29 Sep 2017 03:53:52 +0000 Received: from regular1.263xmail.com ([211.150.99.130]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dxmN1-0002NQ-Q0; Fri, 29 Sep 2017 03:53:50 +0000 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 Subject: [PATCH] ASoC: rockchip: Fix wrong allocation size of dapm routes 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170928_205348_717220_BAB9DC73 X-CRM114-Status: UNSURE ( 6.41 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alsa-devel@alsa-project.org, Heiko Stuebner , Liam Girdwood , Jeffy Chen , Takashi Iwai , Jaroslav Kysela , linux-rockchip@lists.infradead.org, Mark Brown , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.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;