[alsa-devel] [PATCH] ASoC: dapm: fix debugfs read using path->connected
From: KaiChieh Chuang kaichieh.chuang@mediatek.com
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 kaichieh.chuang@mediatek.com --- 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 a10b21c..ee6d9d9a 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 *fi le, 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) -- 1.7.9.5
************* Email Confidentiality Notice ******************** The information contained in this e-mail message (including any attachments) may be confidential, proprietary, privileged, or otherwise exempt from disclosure under applicable laws. It is intended to be conveyed only to the designated recipient(s). Any use, dissemination, distribution, printing, retaining or copying of this e-mail (including its attachments) by unintended recipient(s) is strictly prohibited and may be unlawful. If you are not an intended recipient of this e-mail, or believe that you have received this e-mail in error, please notify the sender immediately (by replying to this e-mail), delete any and all copies of this e-mail (including any attachments) from your system, and do not disclose the content of this e-mail to any other person. Thank you!
On Fri, Feb 02, 2018 at 03:03:35PM +0800, kaichieh.chuang@mediatek.com wrote:
From: KaiChieh Chuang kaichieh.chuang@mediatek.com
This fix a bug in dapm_widget_power_read_file(), where it may sent opposite order of source/sink widget into the p->connected().
This doesn't apply against my tree or Linus' tree, can you please check and resend? The change itself seems to make sense.
On Fri, 2018-02-02 at 16:53 +0100, Mark Brown wrote:
On Fri, Feb 02, 2018 at 03:03:35PM +0800, kaichieh.chuang@mediatek.com wrote:
From: KaiChieh Chuang kaichieh.chuang@mediatek.com
This fix a bug in dapm_widget_power_read_file(), where it may sent opposite order of source/sink widget into the p->connected().
This doesn't apply against my tree or Linus' tree, can you please check and resend? The change itself seems to make sense.
I can't figure out where I have do it wrong, can you help me point it out? Thanks
this is how i get the code base: git clone http://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git git checkout remotes/origin/for-next
HEAD commit is at commit 56821b5652e2228ba875b72c73f4d8450b63e032 Merge: f91a4c1 0619093 Author: Mark Brown broonie@kernel.org Date: Wed Jan 31 10:42:43 2018 +0000
Merge remote-tracking branch 'asoc/fix/mtk' into asoc-linus
which matches the tree on http https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git/log/?h=for... t
************* Email Confidentiality Notice ******************** The information contained in this e-mail message (including any attachments) may be confidential, proprietary, privileged, or otherwise exempt from disclosure under applicable laws. It is intended to be conveyed only to the designated recipient(s). Any use, dissemination, distribution, printing, retaining or copying of this e-mail (including its attachments) by unintended recipient(s) is strictly prohibited and may be unlawful. If you are not an intended recipient of this e-mail, or believe that you have received this e-mail in error, please notify the sender immediately (by replying to this e-mail), delete any and all copies of this e-mail (including any attachments) from your system, and do not disclose the content of this e-mail to any other person. Thank you!
On Fri, 2018-02-02 at 16:53 +0100, Mark Brown wrote:
This doesn't apply against my tree or Linus' tree, can you please check and resend? The change itself seems to make sense.
Maybe its because the "Email Confidentiality Notice" at the end?
Let me try to sent one without it.
On Mon, Feb 05, 2018 at 12:56:20PM +0800, KaiChieh Chuang wrote:
On Fri, 2018-02-02 at 16:53 +0100, Mark Brown wrote:
This doesn't apply against my tree or Linus' tree, can you please check and resend? The change itself seems to make sense.
Maybe its because the "Email Confidentiality Notice" at the end?
Let me try to sent one without it.
Ah, that could be - or perhaps your mail system is mangling the patch so that git and patch can't exactly understand it. You looked to be generating against a sensible tree based on your earlier mail so I'm guessing it's something about it being damaged in transfer.
participants (3)
-
KaiChieh Chuang -
kaichieh.chuang＠mediatek.com
-
Mark Brown