From: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
To: Mark Brown <broonie@opensource.wolfsonmicro.com>,
Liam Girdwood <lrg@slimlogic.co.uk>
Cc: alsa-devel@alsa-project.org, patches@opensource.wolfsonmicro.com
Subject: [PATCH] ASoC: soc-core: Simplify compress_type overriding functionality
Date: Tue, 11 Jan 2011 11:36:13 +0000 [thread overview]
Message-ID: <1294745773-5123-1-git-send-email-dp@opensource.wolfsonmicro.com> (raw)
Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
---
sound/soc/soc-core.c | 9 +--------
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 2ff708a..13c4092 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1761,15 +1761,8 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card)
if (i == card->num_configs) {
/* no need to override the compress_type so
* go ahead and do the standard thing */
- ret = snd_soc_init_codec_cache(codec, 0);
- if (ret < 0) {
- mutex_unlock(&card->mutex);
- return;
- }
- continue;
+ compress_type = 0;
}
- /* override the compress_type with the one supplied in
- * the machine driver */
ret = snd_soc_init_codec_cache(codec, compress_type);
if (ret < 0) {
mutex_unlock(&card->mutex);
--
1.7.3.5
next reply other threads:[~2011-01-11 11:36 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-11 11:36 Dimitris Papastamos [this message]
2011-01-11 11:35 ` [PATCH] ASoC: soc-core: Simplify compress_type overriding functionality Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2011-01-11 11:43 Dimitris Papastamos
2011-01-11 11:47 ` Liam Girdwood
2011-01-11 18:32 ` 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=1294745773-5123-1-git-send-email-dp@opensource.wolfsonmicro.com \
--to=dp@opensource.wolfsonmicro.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=lrg@slimlogic.co.uk \
--cc=patches@opensource.wolfsonmicro.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).