diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2011-01-24 16:09:22 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-25 10:12:36 -0500 |
commit | 81d7da5404aad930a4e4f6111e4f16b752183018 (patch) | |
tree | b9a3d9d1bf3532d728e917b519cce68ea8a6bf03 /sound/soc/samsung/neo1973_wm8753.c | |
parent | 20a4e7fc7e213365ea3771d7bf1e10a6bab853be (diff) |
ASoC: Fix codec device id format used by some dai_links
The id part of an I2C device name is created with the "%d-%04x" format string.
So for example for an I2C device which is connected to the adapter with the id 0
and has its address set to 0x1a the id part of the devices name would be
"0-001a".
Currently some sound board drivers have the id part the codec_name field of
their dai_link structures set as if it had been created by a "%d-0x%x" format
string. For example "0-0x1a" instead of "0-001a".
As a result there is no match between the codec device and the dai_link and no
sound card is instantiated.
This patch fixes it.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@kernel.org
Diffstat (limited to 'sound/soc/samsung/neo1973_wm8753.c')
-rw-r--r-- | sound/soc/samsung/neo1973_wm8753.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/samsung/neo1973_wm8753.c b/sound/soc/samsung/neo1973_wm8753.c index c7a24514beb5..cf69e146890b 100644 --- a/sound/soc/samsung/neo1973_wm8753.c +++ b/sound/soc/samsung/neo1973_wm8753.c | |||
@@ -561,7 +561,7 @@ static struct snd_soc_dai_link neo1973_dai[] = { | |||
561 | .platform_name = "samsung-audio", | 561 | .platform_name = "samsung-audio", |
562 | .cpu_dai_name = "s3c24xx-i2s", | 562 | .cpu_dai_name = "s3c24xx-i2s", |
563 | .codec_dai_name = "wm8753-hifi", | 563 | .codec_dai_name = "wm8753-hifi", |
564 | .codec_name = "wm8753-codec.0-0x1a", | 564 | .codec_name = "wm8753-codec.0-001a", |
565 | .init = neo1973_wm8753_init, | 565 | .init = neo1973_wm8753_init, |
566 | .ops = &neo1973_hifi_ops, | 566 | .ops = &neo1973_hifi_ops, |
567 | }, | 567 | }, |
@@ -571,7 +571,7 @@ static struct snd_soc_dai_link neo1973_dai[] = { | |||
571 | .platform_name = "samsung-audio", | 571 | .platform_name = "samsung-audio", |
572 | .cpu_dai_name = "bluetooth-dai", | 572 | .cpu_dai_name = "bluetooth-dai", |
573 | .codec_dai_name = "wm8753-voice", | 573 | .codec_dai_name = "wm8753-voice", |
574 | .codec_name = "wm8753-codec.0-0x1a", | 574 | .codec_name = "wm8753-codec.0-001a", |
575 | .ops = &neo1973_voice_ops, | 575 | .ops = &neo1973_voice_ops, |
576 | }, | 576 | }, |
577 | }; | 577 | }; |