2009-09-04 19:17:21

by Robert Schwebel

Subject: [PATCH] linux-next: fix pxa2xx-ac97.c breakage

Today's linux-next fails to build with

sound/arm/pxa2xx-ac97.c: In function 'pxa2xx_ac97_probe':
sound/arm/pxa2xx-ac97.c:211: error: 'pxa2xx_audio_ops_t' has no member named 'codec_data'
make[2]: *** [sound/arm/pxa2xx-ac97.o] Error 1

It looks like commit e2365bf313fb21b49b1e4c911033389564428d03 has
introduced this; patch below.

Signed-off-by: Robert Schwebel <[email protected]>
---
sound/arm/pxa2xx-ac97.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c
index 3983aee..b4b48af 100644
--- a/sound/arm/pxa2xx-ac97.c
+++ b/sound/arm/pxa2xx-ac97.c
@@ -208,7 +208,7 @@ 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[0])
+ if (pdata && pdata->codec_pdata[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);
--
1.5.6.5

--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |

2009-09-04 19:21:22

by Mark Brown

Subject: Re: [PATCH] linux-next: fix pxa2xx-ac97.c breakage

On Fri, Sep 04, 2009 at 09:16:36PM +0200, Robert Schwebel wrote:
> Today's linux-next fails to build with

> sound/arm/pxa2xx-ac97.c: In function 'pxa2xx_ac97_probe':
> sound/arm/pxa2xx-ac97.c:211: error: 'pxa2xx_audio_ops_t' has no member named 'codec_data'
> make[2]: *** [sound/arm/pxa2xx-ac97.o] Error 1

> It looks like commit e2365bf313fb21b49b1e4c911033389564428d03 has
> introduced this; patch below.

Applied, thanks.