aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Vasut <marek.vasut@gmail.com>2009-08-21 14:02:52 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-08-23 13:18:01 -0400
commite2365bf313fb21b49b1e4c911033389564428d03 (patch)
tree6d4f0601fddc7ecc1a081d9ad61db0ef684ad876
parent821ebc86efd4b42aa120076562b0fd4f03ec3c0c (diff)
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>
-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 6c00ea45d5cb..757b480bd5b5 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)
207 snprintf(card->longname, sizeof(card->longname), 207 snprintf(card->longname, sizeof(card->longname),
208 "%s (%s)", dev->dev.driver->name, card->mixername); 208 "%s (%s)", dev->dev.driver->name, card->mixername);
209 209
210 if (pdata && pdata->codec_data) 210 if (pdata && pdata->codec_data[0])
211 snd_ac97_dev_add_pdata(ac97_bus->codec[0], pdata->codec_pdata); 211 snd_ac97_dev_add_pdata(ac97_bus->codec[0], pdata->codec_pdata[0]);
212 snd_card_set_dev(card, &dev->dev); 212 snd_card_set_dev(card, &dev->dev);
213 ret = snd_card_register(card); 213 ret = snd_card_register(card);
214 if (ret == 0) { 214 if (ret == 0) {
diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c
index 7330e5c5b9df..e9ae7b3a7e00 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)
251 251
252 for (i = 0; i < ARRAY_SIZE(pxa_ac97_dai); i++) { 252 for (i = 0; i < ARRAY_SIZE(pxa_ac97_dai); i++) {
253 pxa_ac97_dai[i].dev = &pdev->dev; 253 pxa_ac97_dai[i].dev = &pdev->dev;
254 if (pdata && pdata->codec_pdata) 254 if (pdata && pdata->codec_pdata[0])
255 pxa_ac97_dai[i].ac97_pdata = pdata->codec_pdata; 255 pxa_ac97_dai[i].ac97_pdata = pdata->codec_pdata[0];
256 } 256 }
257 257
258 /* Punt most of the init to the SoC probe; we may need the machine 258 /* Punt most of the init to the SoC probe; we may need the machine