From patchwork Mon Feb 26 11:17:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 129625 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp83691lja; Mon, 26 Feb 2018 03:17:38 -0800 (PST) X-Google-Smtp-Source: AG47ELuh7zxejCLCHXVTgCmAfh/DYKEsYgaOLGDLH+sDwXL71iHEOyptZ4A2y1Z4eH/fsy4idfIW X-Received: by 10.28.66.69 with SMTP id p66mr3440210wma.119.1519643858544; Mon, 26 Feb 2018 03:17:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519643858; cv=none; d=google.com; s=arc-20160816; b=Rm7v4+s0bNiOSyIP0oQFWbgxOIbPukjVPstvz8933Lsrh7HzsA29CedIg8t4CNRc4Y NSDidkJULKCXI/1oxosi9c2zEyJ4464FqRFNiFuOEh7tDNbLCrT4h7GE3K0aZO6O6uZm DQzSpi5N9517THZCQckizUtHyjB+CbIrBcndUxIJZrz2QlTNXMYuMxSvu0x4z1pgKO+2 FzNnYiRBTH3ylU4jH4YPbfEUYP5p+QekfZwcalaq0KvxRG5eKbnDjOrIuVvA5sHZhF7v VWGZ1D8o16HNtyeIOYYZJWllhhDPJ0IKEOgnXtpOhiCXEIv57sxDFfKAEBco7wTbBxpd w5dQ== 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:arc-authentication-results; bh=97dHohwbeucQvw9VfMG5/G/b2B3cILPOq3H5jTbWcJc=; b=zkJ/Dc6ojbAAiMdkZJCxH2CaQTvMckqhetbyK5R3IHvSRzZMpPiOiLSgvbFh5FuLie 8DPvLfaQDD7sqfZk+9y9TlT7MjPE/Xr0L1APsImKpYwUIX/RA1GLfO9qQCOd66ie12Zv zIQI8TAfMRZ/cBncKAW5D9FHgWQegoS60BZJl9W6Ilco4iVKhq5964taxi51277EAy1m mcphgFOqXzhosJmJipCWXwYZ05qFTaP4cp+bKwO4e8z7nNp4uUREglFXACEKExq8tLpC dk1GunZ612kLD3/62C9UJjszOSYyuDo8HhjrPIY8Gbak77ibXEjdOWOcOYTUvU/yD1su j9qA== 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=B6JKQ2BG; 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 Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id i14si6752389wrh.111.2018.02.26.03.17.38; Mon, 26 Feb 2018 03:17:38 -0800 (PST) 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=B6JKQ2BG; 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 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 0F9A3267A5A; Mon, 26 Feb 2018 12:17:24 +0100 (CET) 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 8F4A5267A53; Mon, 26 Feb 2018 12:17:20 +0100 (CET) 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, SPF_PASS, T_RP_MATCHES_RCVD 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 F147E267990 for ; Mon, 26 Feb 2018 12:17:18 +0100 (CET) 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=b4+m3zsy12sR9DLEapUdOc/qPGBFlC0KBHfwAcxgZBU=; b=B6JKQ2BGTCyB vSTA0e9S3UkHWIUbsQFpwm7sgMhsTRCwMwqByc+cEprsvEsHa6n2xUbdYE0D8me5+yS8Swcb49DYa AECRe6PDdUfdUi0ferW0CE7UTWEoTHrl0Qj60oBPtQbrJpvsj6bIL9MWey+4Y11uwMOxhEw09sCM8 4VVbg=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1eqGmS-0007vF-Tn; Mon, 26 Feb 2018 11:17:16 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1eqGmS-0005Qb-FD; Mon, 26 Feb 2018 11:17:16 +0000 From: Mark Brown To: Fabio Estevam In-Reply-To: <1519326142-26421-1-git-send-email-festevam@gmail.com> Message-Id: Date: Mon, 26 Feb 2018 11:17:16 +0000 Cc: alsa-devel@alsa-project.org, broonie@kernel.org, lars@metafoo.de Subject: [alsa-devel] Applied "ASoC: soc-generic-dmaengine-pcm: Fix error handling" 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: soc-generic-dmaengine-pcm: Fix error handling 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 f91b1e73ccde71d4bc69ae10d475196df38844ab Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 22 Feb 2018 16:02:21 -0300 Subject: [PATCH] ASoC: soc-generic-dmaengine-pcm: Fix error handling When dmaengine_pcm_request_chan_of() fails it should release the previously acquired resources, which in this case is to call kfree(pcm), so jump to the correct point in the error path. Signed-off-by: Fabio Estevam Signed-off-by: Mark Brown --- sound/soc/soc-generic-dmaengine-pcm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.16.1 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c index 768247fd92c5..32ea16d062b1 100644 --- a/sound/soc/soc-generic-dmaengine-pcm.c +++ b/sound/soc/soc-generic-dmaengine-pcm.c @@ -450,7 +450,7 @@ int snd_dmaengine_pcm_register(struct device *dev, ret = dmaengine_pcm_request_chan_of(pcm, dev, config); if (ret) - goto err_free_dma; + goto err_free_pcm; ret = snd_soc_add_component(dev, &pcm->component, &dmaengine_pcm_component, NULL, 0); @@ -461,6 +461,7 @@ int snd_dmaengine_pcm_register(struct device *dev, err_free_dma: dmaengine_pcm_release_chan(pcm); +err_free_pcm: kfree(pcm); return ret; }