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>

diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c
index 6c00ea45d5cb5854e21f67dd024c5e1da9c2e661..757b480bd5b509c116a82e0b084ca7f17a4af1ee 100644 (file)
--- 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 7330e5c5b9df2a138ffe2ee78feb25802966cbf2..e9ae7b3a7e006cc33cc74e128f9f1429f3ebc9ac 100644 (file)
--- 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