From patchwork Mon Feb 26 20:00:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 129700 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp584766lja; Mon, 26 Feb 2018 12:00:42 -0800 (PST) X-Google-Smtp-Source: AH8x224T+DLwTm5yD6y0XrW8zCxu0rrcrV+Vqndt4DUkoECZIzE4sTOb6aL7qtUTqhld42UsIoYa X-Received: by 10.223.136.188 with SMTP id f57mr10292910wrf.7.1519675241998; Mon, 26 Feb 2018 12:00:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519675241; cv=none; d=google.com; s=arc-20160816; b=EqT58j/ibNIsVzBvcOqGTJK7T2Fy53Gwuay/4xaiZeX3BeeANkSts2rWnd2VQWg4kr kaOIAh6lLhjSD2NIArx707KI0pGZY67tDxPHbvylUnIgFPqAPhMK4VI8lQI43nSRWCKp mI2Kv67tS+5rRHMSVzQjPgiAKjoO6KN1LCelyrfgIzcx2KPx8EPvxpXIQZ4JkclEJjgN tBxMKNAlkZjs2Hsek/1qvKbx0mfb6YVDcHEWYMWffbtvxD809xXyeBCK8DpEgyzzCxpH gsGJfVrhHd7oBkgEvAidOGuSYxp6F/4OtidZnexW4qvJjsVZ5PIqKNNN2YwCzMGUd4Xy Hvbg== 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=SQISs5lBm8qdfq7M2q0h2/BmnljMi2PSXsMItBUGFM0=; b=hoICqgMEAee54f0lmhcu5KmehfpdTv8X6RFXhtkbtJ1tlwNZPy2TIfZgQ004214i+s QFrMxH2QsR84mneSViQLK4Xs6C0Q2Y2ocQMAUB0tabzDMAjjWmVioMQCuIq5oKcw+kGF ieKbEOTS9crDki7ZZFPAIxh6yMmuUnxQ7vDRXsgsBznPiggYtlaOHJ1Yxu9cQzIMFexl 18SjZsa9rq0VCbRAvhiPfq+Swvgenw67yja6iNOKtzFCvcia+9+SzkBL0ysVI2d045+i sC2qr50jFmkRSzgiJsaeR9eo3Ix8fs1wDW45XBz5D9OaANwIvUFbfOB1FZgDcFy54IBS flmA== 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=APyLY0rj; 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 m54si7957246wrm.302.2018.02.26.12.00.41; Mon, 26 Feb 2018 12:00:41 -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=APyLY0rj; 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 551C826761B; Mon, 26 Feb 2018 21:00:40 +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 7869826761D; Mon, 26 Feb 2018 21:00:38 +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 202A0267516 for ; Mon, 26 Feb 2018 21:00:35 +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=XGoxiCMLrzJ+lHyr8ufIYsrtoFupw81/4EVWTJfVJ0w=; b=APyLY0rjjbFC l3bp0K40kwgn1vxdsMN3/qDjxdeG7bLrQvjU/SyHeCOEJZMLU6MNWJaxFb8daZZPReM2gg80iRAT2 eD5aEUGLBLIb6oTQp55PC8GvP1pLWPOAAxBpfz7297h2KO13BhGihNtta7MrASSy9iFg6MubcDBh1 yX2Ps=; 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 1eqOwr-00088G-EA; Mon, 26 Feb 2018 20:00:33 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1eqOwq-0006v9-PC; Mon, 26 Feb 2018 20:00:32 +0000 From: Mark Brown To: Fabio Estevam In-Reply-To: Message-Id: Date: Mon, 26 Feb 2018 20:00:32 +0000 Cc: alsa-devel@alsa-project.org, Mark Brown Subject: [alsa-devel] Applied "ASoC: Revert "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: Revert "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 b84acf44d5b86597cebcb6aca16e7dd9ca2b0294 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 26 Feb 2018 15:55:25 -0300 Subject: [PATCH] ASoC: Revert "ASoC: soc-generic-dmaengine-pcm: Fix error handling" This reverts commit f91b1e73ccde71d4bc69ae10d475196df38844ab. As explained by Lars-Peter Clausen: "This creates a resource leak. dmaengine_pcm_request_chan_of() requests bothtransmit and receive channels. It might return with an error if one of them fails, but the other one succeeded. In this case we need to call dmaengine_pcm_release_chan() to free the requested channel" So revert the commit. Signed-off-by: Fabio Estevam Signed-off-by: Mark Brown --- sound/soc/soc-generic-dmaengine-pcm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 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 567fbdfd1ca9..56a541b9ff9e 100644 --- a/sound/soc/soc-generic-dmaengine-pcm.c +++ b/sound/soc/soc-generic-dmaengine-pcm.c @@ -504,7 +504,7 @@ int snd_dmaengine_pcm_register(struct device *dev, ret = dmaengine_pcm_request_chan_of(pcm, dev, config); if (ret) - goto err_free_pcm; + goto err_free_dma; if (config && config->process) ret = snd_soc_add_component(dev, &pcm->component, @@ -520,7 +520,6 @@ int snd_dmaengine_pcm_register(struct device *dev, err_free_dma: dmaengine_pcm_release_chan(pcm); -err_free_pcm: kfree(pcm); return ret; }