Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2365bf3 authored by Marek Vasut's avatar Marek Vasut Committed by Mark Brown
Browse files

ASoC: Pass correct platform data from pxa2xx-ac97 



Signed-off-by: default avatarMarek Vasut <marek.vasut@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 821ebc86

sound/arm/pxa2xx-ac97.c

+2 −2
Original line number Diff line number Diff line
@@ -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) {

sound/soc/pxa/pxa2xx-ac97.c

+2 −2
Original line number Diff line number Diff line
@@ -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