From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933206AbcLILwf (ORCPT ); Fri, 9 Dec 2016 06:52:35 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:57715 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932393AbcLILwe (ORCPT ); Fri, 9 Dec 2016 06:52:34 -0500 From: Arnd Bergmann To: Mark Brown Cc: Arnd Bergmann , Liam Girdwood , Mengdong Lin , Sudip Mukherjee , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [PATCH] ASoC: topology: avoid uninitialized kcontrol_type Date: Fri, 9 Dec 2016 12:51:46 +0100 Message-Id: <20161209115207.3885433-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:anI3UCMRPxmOICcVrfD18BzyQZhnAI1vGDRg+DhkWJxePXy6OFQ ZpbfAPdHe5JrMCIJzvErSGwFysKb6rtp/RgGCwd2UCGIAFLMdq5BcJESw8IZznXG/HFi4zW /L1wmqTsMxqWqVDJ+JYErwZP4MT/ZRtYCN0zal80DWBsc7gxSSR3PIEXSyGjo6HCPzaNMFV 4sCZYO6QHbZHJ7NaXrPBQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:WTq6E84Amd0=:bwmqnFLl3FOhXBA7XgIFSA ILazX+TfJYL87Tm2Eo6D4I7TNhVkw1cV/dpb1VsJDp9nD1hYyA7Jwo/ozEZy0Xa3RzpxB7oiw dePItYiA86gFo85ECs1pohe1H9iAklDMG99fSMwYLo9PeNSsrzJlwHwSqmOFjFjeDWaEhGcp8 qY0m/7iPnS/lahPzXqvYw2DyNWvWn8uN++2Axmt6tOKcXDbw4+YGcp6Jv0/+r6ko01lSW8gWn p4piWannDxN8+JZtjGCUE5yqqkzX6bKzUMrw4ANFU6ZhbC2+16GBCgtb5QslqI/2bRogNulAe hM9jbuefgSPw7YgyD37ZW3tDbk41yM+8/Tyt5PeNvGDWWabezOpF4O5AW8cpSnmyYM3HVP9sE Zx2RdZKMqrJQYeraiuuRLKPBk8X9tCx3XNAfzx+ekzOcXVjf6N3I9+8TYGyPFybjw4herwmkQ 66fVkRPMscS2tZg2gEmeaOe60jrmEFvtYpolWdcYNfo92tHE7/pjvrRvwXbM7nfZCEVWhqARW mBhzPO1D7X9sbuJvBJCuyDtHRwDp9gEF4TXV4RGRRBLovmmpQp+F6tYG1bgngPja3jIdGe2Bu TJjDoC1/o9tXFwWA4BDft67b55TunAUxeeLmx0lKe7fbAXgHv/bnKKSaiOWGF7qwInpCJmYCY WnCajXSN/35uQGuAOZU8X4FndlCTyRUEN0lPHQgiH8X4IonTUr23WXJhRi2nQbWsxCwM= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When num_kcontrols is zero, widget->dobj.widget.kcontrol_type gets set to an uninitialized local variable: sound/soc/soc-topology.c: In function 'soc_tplg_dapm_widget_create': sound/soc/soc-topology.c:1566:36: error: 'kcontrol_type' may be used uninitialized in this function [-Werror=maybe-uninitialized] I could not figure out which of the valid types would be appropriate here, so this sets it to '0', which is invalid but at least well-defined here. There is probably a better way to address the issue. Fixes: eea3dd4f1247 ("ASoC: topology: Only free TLV for volume mixers of a widget") Signed-off-by: Arnd Bergmann --- sound/soc/soc-topology.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index 11feb19e9730..65670b2b408c 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -1485,6 +1485,7 @@ static int soc_tplg_dapm_widget_create(struct soc_tplg *tplg, tplg->pos += (sizeof(struct snd_soc_tplg_dapm_widget) + w->priv.size); if (w->num_kcontrols == 0) { + kcontrol_type = 0; template.num_kcontrols = 0; goto widget; } -- 2.9.0