aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMarek Vasut <marek.vasut@gmail.com>2009-08-21 20:02:52 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-08-23 18:18:01 +0100
commite2365bf313fb21b49b1e4c911033389564428d03 (patch)
tree6d4f0601fddc7ecc1a081d9ad61db0ef684ad876 /sound
parent821ebc86efd4b42aa120076562b0fd4f03ec3c0c (diff)
downloadlinux-linaro-precise-e2365bf313fb21b49b1e4c911033389564428d03.tar.gz
ASoC: Pass correct platform data from pxa2xx-ac97
Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/arm/pxa2xx-ac97.c4
-rw-r--r--sound/soc/pxa/pxa2xx-ac97.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c
index 6c00ea45d5c..757b480bd5b 100644
--- a/sound/arm/pxa2xx-ac97.c
+++ b/sound/arm/pxa2xx-ac97.c
@@ -207,8 +207,8 @@ static int __devinit pxa2xx_ac97_probe(struct platform_device *dev)
snprintf(card->longname, sizeof(card->longname),
"%s (%s)", dev->dev.driver->name, card->mixername);
- if (pdata && pdata->codec_data)
- snd_ac97_dev_add_pdata(ac97_bus->codec[0], pdata->codec_pdata);
+ if (pdata && pdata->codec_data[0])
+ snd_ac97_dev_add_pdata(ac97_bus->codec[0], pdata->codec_pdata[0]);
snd_card_set_dev(card, &dev->dev);
ret = snd_card_register(card);
if (ret == 0) {
diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c
index 7330e5c5b9d..e9ae7b3a7e0 100644
--- a/sound/soc/pxa/pxa2xx-ac97.c
+++ b/sound/soc/pxa/pxa2xx-ac97.c
@@ -251,8 +251,8 @@ static int __devinit pxa2xx_ac97_dev_probe(struct platform_device *pdev)
for (i = 0; i < ARRAY_SIZE(pxa_ac97_dai); i++) {
pxa_ac97_dai[i].dev = &pdev->dev;
- if (pdata && pdata->codec_pdata)
- pxa_ac97_dai[i].ac97_pdata = pdata->codec_pdata;
+ if (pdata && pdata->codec_pdata[0])
+ pxa_ac97_dai[i].ac97_pdata = pdata->codec_pdata[0];
}
/* Punt most of the init to the SoC probe; we may need the machine