From patchwork Tue Sep 11 11:30:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 146448 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp3528061ljw; Tue, 11 Sep 2018 04:30:22 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZjiapLWBzvohXi+YcyipUL14R6Ng8VNb32zOzPLuLuo0X8Ct2J2ZZQy91l0/YSqc4+fzNP X-Received: by 2002:a5d:418c:: with SMTP id m12-v6mr17880697wrp.8.1536665422767; Tue, 11 Sep 2018 04:30:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536665422; cv=none; d=google.com; s=arc-20160816; b=zUnFdqufKCPz8KSqhDQ6i578VQGAlKHVDC4lxbgQxYA5AWKutFe2lhJVmhzpvGHhbV 3Y3C/loVEh50rhc0DBUx5WpPdGuGES8RsK2iXChbtS6AQxudVHHy2aAqNLLI/j88T2FX 0b7zPmIY5ywDBG5QtrkkNx2OZQxUiBNDFvnBiNg6mRTU8am9lxUI/GqbQEL7j68JKhou 2yLIfwaz+0dLvqeA7prt7a+pj+WTAJbmGgT0GxekchpZxmqsPXoVF9HvxiyLTxiPYysZ FlxVLJGvuF5z84MwBhDzxnfAEU2DIqaLJ3WlC22IbQ4BR2boEPN/aXyZkTuIfArIeZ9J HdIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to; bh=aB4SnQ5Xji2wTtHPc8MPfGHi+yZOBdGWdSxaXYQlj7Y=; b=PBj0f46K4EogvQO3+W/btsOXmfPO1awIuT5kedUyDh5RYDba6ehYL8a0Ad64Sp5gAu wlwI/GDjZPFLZDMX6jb/w9nGt14TNj09BWlSJ+WXWrlg5MOacSLXfitixckXcGyoYMeb rxAzUYSVUAcBILHt6D8f2pVAT/HPuPXCxut9UbJpI/keUXSUXjaDGPO4bXkfqtqaEtFy 964xyEb4ZECcLhm6C4/6IURopwoPJU5WsWC5mSEMb7wSagSJjovnRJLQN4N+9vHZws9t lIX5q4M6fZ5fsRpwt+jB1WB/Y7TB5mbNu99apZJ95xVM/mlhjQRic5lYHUQog+PI5pIJ V/sQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=GFkpDovz; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id z17-v6si17128695wrn.224.2018.09.11.04.30.22; Tue, 11 Sep 2018 04:30:22 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=GFkpDovz; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 54F4826788E; Tue, 11 Sep 2018 13:30:17 +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 8DEC726787A; Tue, 11 Sep 2018 13:30:15 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id 14B412676EB for ; Tue, 11 Sep 2018 13:30:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=r/nmDM2iVgM3XYdxlIpXjEbRM2eDdpm/fa5hTepBfBM=; b=GFkpDovzfLcM 2QJwnzeWQcnoPHo2zfRYHDY4KXuxLWT2Fm2T65FkFDuQpBHt1qVGXtux+a8zhSRSMXW6brGDte+AS Gl3en5I9gU+9rfQu4A3gzfIEhLjtf7dOHPeWS0rnBWuHkhh3O4RAQxs07g+bJ0hqMMp4km/iughsH kB2ZI=; Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=debutante.sirena.org.uk) by heliosphere.sirena.org.uk with esmtpa (Exim 4.89) (envelope-from ) id 1fzgs1-0004mm-S7; Tue, 11 Sep 2018 11:30:13 +0000 Received: by debutante.sirena.org.uk (Postfix, from userid 1000) id 9C5661121AF8; Tue, 11 Sep 2018 12:30:13 +0100 (BST) From: Mark Brown To: Dan Carpenter In-Reply-To: <20180910113518.430D71122D51@debutante.sirena.org.uk> Message-Id: <20180911113013.9C5661121AF8@debutante.sirena.org.uk> Date: Tue, 11 Sep 2018 12:30:13 +0100 (BST) Cc: alsa-devel@alsa-project.org, Mark Brown Subject: [alsa-devel] Applied "ASoC: dapm: Fix a couple uninitialized ret variables" to the asoc tree 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 The patch ASoC: dapm: Fix a couple uninitialized ret variables has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 2e558a8127de7b2ed3302f9adcf332ba3feeadb2 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Fri, 7 Sep 2018 22:40:33 +0300 Subject: [PATCH] ASoC: dapm: Fix a couple uninitialized ret variables Smatch complains that these variables could be uninitialized. The first one in snd_soc_dai_link_event() is probably a false positive, because probably we know the lists are not empty. I would normally ignore the warning, but GCC complains here as well so I just silenced the warning. The "ret" in snd_soc_dapm_new_dai() does need to be initialized or it leads to a bogus dereference in the caller. Fixes: 3bbf5d34fd4a ("ASoC: dapm: Move error handling to snd_soc_dapm_new_control_unlocked") Signed-off-by: Dan Carpenter Signed-off-by: Mark Brown --- sound/soc/soc-dapm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.19.0.rc2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index e496bc642c99..0dcdcc23dcfd 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -3938,8 +3938,10 @@ snd_soc_dapm_new_dai(struct snd_soc_card *card, struct snd_soc_pcm_runtime *rtd, dev_dbg(card->dev, "ASoC: adding %s widget\n", link_name); w = snd_soc_dapm_new_control_unlocked(&card->dapm, &template); - if (IS_ERR(w)) + if (IS_ERR(w)) { + ret = PTR_ERR(w); goto outfree_kcontrol_news; + } w->priv = rtd;