summaryrefslogtreecommitdiffstats
path: root/sound/soc/samsung/s3c24xx_uda134x.c
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2011-01-24 22:12:42 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-01-25 16:12:44 +0100
commit518aa59f6e45b3c90b849187ae1d56757d074b92 (patch)
treef7ad26cca0faeef51b184bc90ba722a0186ac3ff /sound/soc/samsung/s3c24xx_uda134x.c
parentASoC: Fix codec device id format used by some dai_links (diff)
downloadlinux-518aa59f6e45b3c90b849187ae1d56757d074b92.tar.xz
linux-518aa59f6e45b3c90b849187ae1d56757d074b92.zip
ASoC: Samsung: Fix outdated cpu_dai_name for s3c24xx i2s
During the multi-component patch the s3c24xx i2s driver was renamed from "s3c24xx-i2s" to "s3c24xx-iis", while the sound board drivers were not updated to reflect this change as well. As a result there is no match between the dai_link and the i2s driver and no sound card is instantiated. This patch fixes the problem by updating the sound board drivers to use "s3c24xx-iis" for the cpu_dai_name. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Acked-by: Jassi Brar <jassi.brar@samsung.com> 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/s3c24xx_uda134x.c')
-rw-r--r--sound/soc/samsung/s3c24xx_uda134x.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/samsung/s3c24xx_uda134x.c b/sound/soc/samsung/s3c24xx_uda134x.c
index cdc8ecbcb8ef..2c09e93dd566 100644
--- a/sound/soc/samsung/s3c24xx_uda134x.c
+++ b/sound/soc/samsung/s3c24xx_uda134x.c
@@ -228,7 +228,7 @@ static struct snd_soc_dai_link s3c24xx_uda134x_dai_link = {
.stream_name = "UDA134X",
.codec_name = "uda134x-hifi",
.codec_dai_name = "uda134x-hifi",
- .cpu_dai_name = "s3c24xx-i2s",
+ .cpu_dai_name = "s3c24xx-iis",
.ops = &s3c24xx_uda134x_ops,
.platform_name = "samsung-audio",
};