kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ASoC: Pass correct platform data from pxa2xx-ac97

Browse source 
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Marek Vasut 2009-08-21 20:02:52 +02:00 committed by Mark Brown
parent 821ebc86ef
commit e2365bf313
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sound/arm/pxa2xx-ac97.c
View file

@ -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) {

4
sound/soc/pxa/pxa2xx-ac97.c
View file

@ -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