From: Jarkko Nikula <jhnikula@gmail.com>
To: alsa-devel@alsa-project.org
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>,
Liam Girdwood <lrg@slimlogic.co.uk>
Subject: [RFC 2.6.38] ASoC: Fix build error caused by merging a fix for 2.6.37 into 2.6.38
Date: Fri, 10 Dec 2010 20:54:49 +0200 [thread overview]
Message-ID: <1292007289-22124-1-git-send-email-jhnikula@gmail.com> (raw)
In-Reply-To: <1292007235-22090-1-git-send-email-jhnikula@gmail.com>
Fix "ASoC: Fix bias power down of non-DAPM codec" for 3.6.37 will cause a
build error when merging into ASoC for-2.6.38. Fix the issue by doing a
change that commit ce6120c "ASoC: Decouple DAPM from CODECs" would do.
Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
---
Ideally this would be squashed in ce6120c "ASoC: Decouple DAPM from CODECs".
---
sound/soc/soc-dapm.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 45e6a11..b521a13 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -982,7 +982,7 @@ static int dapm_power_widgets(struct snd_soc_dapm_context *dapm, int event)
sys_power = 1;
break;
case SND_SOC_DAPM_STREAM_STOP:
- sys_power = !!codec->active;
+ sys_power = !!dapm->codec->active;
break;
case SND_SOC_DAPM_STREAM_SUSPEND:
sys_power = 0;
--
1.7.2.3
next prev parent reply other threads:[~2010-12-10 18:53 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-10 16:23 [RFC 2.6.38] ASoC: Fix bias power down of non-DAPM codec Jarkko Nikula
2010-12-10 17:42 ` Mark Brown
2010-12-10 18:53 ` [PATCH 2.6.37] " Jarkko Nikula
2010-12-10 18:54 ` Jarkko Nikula [this message]
2010-12-10 23:02 ` [RFC 2.6.38] ASoC: Fix build error caused by merging a fix for 2.6.37 into 2.6.38 Liam Girdwood
2010-12-13 16:47 ` Mark Brown
2010-12-10 23:02 ` [PATCH 2.6.37] ASoC: Fix bias power down of non-DAPM codec Liam Girdwood
2010-12-13 16:37 ` Mark Brown
2010-12-10 21:25 ` tabs versus space fill Peter Hsiang
2010-12-10 21:35 ` Vasily Khoruzhick
2010-12-10 21:54 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1292007289-22124-1-git-send-email-jhnikula@gmail.com \
--to=jhnikula@gmail.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=lrg@slimlogic.co.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.