From patchwork Mon Feb 5 15:20:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 10200671 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8C30A601A1 for ; Mon, 5 Feb 2018 15:21:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7AD06287A3 for ; Mon, 5 Feb 2018 15:21:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 70C32287C7; Mon, 5 Feb 2018 15:21:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 474D92888F for ; Mon, 5 Feb 2018 15:21:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Date:Message-Id: In-Reply-To:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: References:List-Owner; bh=k/7lO0Qm37xfJs9luE9R24lkkvdUwq1J5N2PMyXSXdA=; b=fk/ +qqLcYdnf61BO5N8KK50eEewivtchPPHGN3Rbyy8k1ce+2jutyzs9gz8IWH8la3ynhPph2bK2Tcbf 5YkpO8HoEqWuyKY7pNTrVR+proN7tb+ksbEHBr5GXzTCTD8SKP3T/KPwJ4fBkoP8s0esN/OCVqan/ Ls+WC+ILTt3e/IBuNJ2i9HTUdtVSZ9r7oy/1cz87zJvgHHzAnXewM6S7DhoizPUkFtY5JtvoqGkZ4 rM2wwYoL0xz2WT4D26ThH0rc2hByihg0hRGH+l35I0m5NCoRCajWqe0ryFe4SNOPV0WC+kDCxHJJJ naWjIrNiM875fACFdBd7qXMgyi25gYA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eiiZu-00007b-3U; Mon, 05 Feb 2018 15:21:06 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eiiZi-0008NJ-6Y for linux-mediatek@bombadil.infradead.org; Mon, 05 Feb 2018 15:20:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; 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=gtciF0f3G70obn1iTBJSsm5aRUrfBhYvLb+UcF4ksek=; b=asJLBikZ36f8gvsan9ypSsmLiA LETXJRp2arEhwa7MLnUbtDzAYO+umY3mpO1B/E4Lwgctq1SbGKmQJFhT8FHc01ERfdVx720opff7I 3XDuC2bRsp4tNL0RiOQtB5vg76s01GuMNfOHF/470qbhPyqf65w49c0ZZubc54fuPObe0ikFdmBsQ 1J4aO5KdvaQFAoLMvM9WW2lQ3LuNzGKR5lqe90f9B9PwOifs40scHt1GB9hcixzd7PpO2noXHOi+L Ucgnu+fOrpzlt1Nll4losYn5UvLoy4OcUqgncaAWmql77nEAhuLS+J5PXnozgYK0rcuU7r8nNxE3S Fwm7UTiA==; Received: from heliosphere.sirena.org.uk ([2a01:7e01::f03c:91ff:fed4:a3b6]) by casper.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eiiZe-0005Ka-4B for linux-mediatek@lists.infradead.org; Mon, 05 Feb 2018 15:20:52 +0000 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=gtciF0f3G70obn1iTBJSsm5aRUrfBhYvLb+UcF4ksek=; b=U52n6kNV5zLm pQkjnXqv3h4V664xM+A6GKmBPzLgFM9CL50SfdNTd8EyR1GxEAhnWYntYehcPYfqpoGhGtQdbHc3/ zhVtNRxCo8xIh4+zAThCCZc63YtR/nrM8mlqkuNJrspd4443E/8jt8sNICd7x/+hmY1dw46pAxQQC pGPg0=; 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 1eiiYy-0006LP-E2; Mon, 05 Feb 2018 15:20:08 +0000 Received: from broonie by debutante with local (Exim 4.90) (envelope-from ) id 1eiiYx-0007GX-U8; Mon, 05 Feb 2018 15:20:07 +0000 From: Mark Brown To: KaiChieh Chuang Subject: Applied "ASoC: dapm: fix debugfs read using path->connected" to the asoc tree In-Reply-To: <1517806800-4210-1-git-send-email-kaichieh.chuang@mediatek.com> Message-Id: Date: Mon, 05 Feb 2018 15:20:07 +0000 X-Bad-Reply: In-Reply-To but no 'Re:' in Subject. X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180205_152050_183484_886144E7 X-CRM114-Status: GOOD ( 16.41 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alsa-devel@alsa-project.org, wsd_upstream@mediatek.com, chipeng.chang@mediatek.com, garlic.tseng@mediatek.com, shane.chien@mediatek.com, broonie@kernel.org, linux-mediatek@lists.infradead.org, kaichieh.chuang@mediatek.com MIME-Version: 1.0 Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+patchwork-linux-mediatek=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The patch ASoC: dapm: fix debugfs read using path->connected 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 7a32c89e89c5529f3d436b7cc6bc8d4447819669 Mon Sep 17 00:00:00 2001 From: KaiChieh Chuang Date: Mon, 5 Feb 2018 13:00:00 +0800 Subject: [PATCH] ASoC: dapm: fix debugfs read using path->connected This fix a bug in dapm_widget_power_read_file(), where it may sent opposite order of source/sink widget into the p->connected(). for example, static int connected_check(source, sink); {"w_sink", NULL, "w_source", connected_check} the dapm_widget_power_read_file() will query p->connected() in following case p->conneted("w_source", "w_sink") p->conneted("w_sink", "w_source") we should avoid the last case, since it's the wrong order (source/sink) as declared in snd_soc_dapm_route. Signed-off-by: KaiChieh Chuang Signed-off-by: Mark Brown --- sound/soc/soc-dapm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index a10b21cfc31e..ee6d9d9a3c5e 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -2026,7 +2026,7 @@ static ssize_t dapm_widget_power_read_file(struct file *file, snd_soc_dapm_for_each_direction(dir) { rdir = SND_SOC_DAPM_DIR_REVERSE(dir); snd_soc_dapm_widget_for_each_path(w, dir, p) { - if (p->connected && !p->connected(w, p->node[rdir])) + if (p->connected && !p->connected(p->source, p->sink)) continue; if (!p->connect)