From patchwork Fri May 19 17:03:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 100201 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp412850qge; Fri, 19 May 2017 10:03:53 -0700 (PDT) X-Received: by 10.223.176.36 with SMTP id f33mr3937454wra.124.1495213432946; Fri, 19 May 2017 10:03:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495213432; cv=none; d=google.com; s=arc-20160816; b=sfmwm1fwItwnjpftrOJo/dhW1qoYQb+krY8+48XO6oVRj/RA1jLvzBWhyJjAD8y739 nMesdBNuuSDRFq15EihWSj1RqGHGN70Gx1yed1R4Vut0FqCaOD1QsCORMTW5saEkgThs o9QdV0DrWnStbSdowOGsX0W9t6CgfuppkJVWAhzE022bC2JAJOs9uJEoSVRya6u+mCR7 hVi1uKUxzbIlhhCuLvBZUqgHK04xF3QSb37bpPQDjCp6Mc3Cuktevyausu8bCeTGa6ch NEkUu4U6I5vEaEK9aZmBLE9ZYHGioGdgBKdnagpFn/03nECtxq00vIRzIiL3gldKx9PJ 9+lw== 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 :delivered-to:arc-authentication-results; bh=zJqSUPbH1in6JxDw5affIOkySalvxp4O+UamOxysefM=; b=kPNr6sbpErzVmRxQ1uGbThwjQHL+/SL3YbLsdTDJF7AIRuFTFy6yEcDv7gojpQhXHa FE7toNjIirFhE7COVMWfhZIE5302MXg/8ER8yJgwhBBOd+oG+e/qShbHcqyWmo/7u2mV 7RpGYKHcB7n79u7iHXSIcW6oAiobKfWt6mz6N/g+JdcnypE1znjnaVMOtH4EN7RjM6xS DWp8RM+fX91jASz3JC0cWVxlXfDoAvZg94qgZfMPlWKZZlBxQPlXa7wbRoWo59jWBfUs AqAd6N99/gXWQsFaSLzgKQ42vrBTibD/iOd9Nzd6y8tXoDCtmj+b/03qJqIi3+RVpqkO ktiQ== ARC-Authentication-Results: i=1; mx.google.com; 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 52si3705391wrv.17.2017.05.19.10.03.52; Fri, 19 May 2017 10:03:52 -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; 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 740D0266986; Fri, 19 May 2017 19:03:51 +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 9BD9A266B88; Fri, 19 May 2017 19:03:49 +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.0 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, RP_MATCHES_RCVD,SPF_PASS autolearn=disabled version=3.4.0 Received: from mezzanine.sirena.org.uk (mezzanine.sirena.org.uk [106.187.55.193]) by alsa0.perex.cz (Postfix) with ESMTP id E36352667A5 for ; Fri, 19 May 2017 19:03:44 +0200 (CEST) Received: from [2001:470:1f1d:6b5::3] (helo=debutante) by mezzanine.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1dBlJR-0000Sz-Pb; Fri, 19 May 2017 17:03:40 +0000 Received: from broonie by debutante with local (Exim 4.89) (envelope-from ) id 1dBlJN-0003b0-AZ; Fri, 19 May 2017 18:03:33 +0100 From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87d1b9y3sk.wl%kuninori.morimoto.gx@renesas.com> Message-Id: Date: Fri, 19 May 2017 18:03:33 +0100 X-SA-Exim-Connect-IP: 2001:470:1f1d:6b5::3 X-SA-Exim-Mail-From: broonie@sirena.org.uk X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: No (on mezzanine.sirena.org.uk); Unknown failure Cc: linux-renesas-soc@vger.kernel.org, alsa-devel@alsa-project.org, Mark Brown , Hiroyuki Yokoyama , Simon Subject: [alsa-devel] Applied "ASoC: rsnd: don't call free_irq() on Parent SSI" 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: rsnd: don't call free_irq() on Parent SSI has been applied to the asoc tree at git://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 1f8754d4daea5f257370a52a30fcb22798c54516 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Tue, 16 May 2017 01:48:24 +0000 Subject: [PATCH] ASoC: rsnd: don't call free_irq() on Parent SSI If SSI uses shared pin, some SSI will be used as parent SSI. Then, normal SSI's remove and Parent SSI's remove (these are same SSI) will be called when unbind or remove timing. In this case, free_irq() will be called twice. This patch solve this issue. Signed-off-by: Kuninori Morimoto Tested-by: Hiroyuki Yokoyama Reported-by: Hiroyuki Yokoyama Signed-off-by: Mark Brown --- sound/soc/sh/rcar/ssi.c | 5 +++++ 1 file changed, 5 insertions(+) -- 2.11.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index e43277a5068c..c224695c1484 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -709,6 +709,11 @@ static int rsnd_ssi_dma_remove(struct rsnd_mod *mod, struct rsnd_priv *priv) { struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod); + struct rsnd_mod *ssi_parent_mod = rsnd_io_to_mod_ssip(io); + + /* Do nothing for SSI parent mod */ + if (ssi_parent_mod == mod) + return 0; /* PIO will request IRQ again */ free_irq(ssi->irq, mod);