summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeiko Stübner <heiko@sntech.de>2012-04-30 13:17:21 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-04-30 23:45:25 +0100
commit06412088ce98f745405b8f65cfc51ddd6b842bbf (patch)
tree035be20eed27e1473cdc512c822a122a87b08e3c
parent30facd4d51d630b6cba386badd7f42456962089b (diff)
downloadlinux-3.10-06412088ce98f745405b8f65cfc51ddd6b842bbf.tar.gz
linux-3.10-06412088ce98f745405b8f65cfc51ddd6b842bbf.tar.bz2
linux-3.10-06412088ce98f745405b8f65cfc51ddd6b842bbf.zip
ASoC: s3c2412-i2s: Fix dai registration
As s3c2412-i2s is using the s3c_i2sv2 it should call the more specialised s3c_i2sv2_register_dai instead of simply calling snd_soc_register_dai. Without this call the snd_soc_dai_ops structure isn't initialised correctly. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/samsung/s3c2412-i2s.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/samsung/s3c2412-i2s.c b/sound/soc/samsung/s3c2412-i2s.c
index 72185078ddf..79fbeea99d4 100644
--- a/sound/soc/samsung/s3c2412-i2s.c
+++ b/sound/soc/samsung/s3c2412-i2s.c
@@ -166,7 +166,7 @@ static struct snd_soc_dai_driver s3c2412_i2s_dai = {
static __devinit int s3c2412_iis_dev_probe(struct platform_device *pdev)
{
- return snd_soc_register_dai(&pdev->dev, &s3c2412_i2s_dai);
+ return s3c_i2sv2_register_dai(&pdev->dev, -1, &s3c2412_i2s_dai);
}
static __devexit int s3c2412_iis_dev_remove(struct platform_device *pdev)