From: Mark Brown <broonie@opensource.wolfsonmicro.com>
To: Liam Girdwood <lrg@slimlogic.co.uk>
Cc: alsa-devel@alsa-project.org, patches@opensource.wolfsonmicro.com,
Mark Brown <broonie@opensource.wolfsonmicro.com>
Subject: [PATCH 1/2] ASoC: Pay attention to driver supplied DAI IDs
Date: Tue, 12 Oct 2010 15:57:55 +0100 [thread overview]
Message-ID: <1286895476-23198-1-git-send-email-broonie@opensource.wolfsonmicro.com> (raw)
The driver can specify a DAI ID number so use that.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
sound/soc/soc-core.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 4f6ea8c..c20cf7f 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -3015,7 +3015,10 @@ int snd_soc_register_dais(struct device *dev,
}
dai->dev = dev;
- dai->id = i;
+ if (dai->driver->id)
+ dai->id = dai->driver->id;
+ else
+ dai->id = i;
dai->driver = &dai_drv[i];
if (!dai->driver->ops)
dai->driver->ops = &null_dai_ops;
--
1.7.1
next reply other threads:[~2010-10-12 14:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-12 14:57 Mark Brown [this message]
2010-10-12 14:57 ` [PATCH 2/2] ASoC: Restore DAI ID specification for WM8994 Mark Brown
2010-10-13 9:30 ` Liam Girdwood
2010-10-12 17:05 ` [PATCH 1/2] ASoC: Pay attention to driver supplied DAI IDs Mark Brown
2010-10-12 18:49 ` Timur Tabi
2010-10-12 21:33 ` 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=1286895476-23198-1-git-send-email-broonie@opensource.wolfsonmicro.com \
--to=broonie@opensource.wolfsonmicro.com \
--cc=alsa-devel@alsa-project.org \
--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).