ASoC: fix pxa2xx-ac97.c breakage
authorRobert Schwebel <r.schwebel@pengutronix.de>
Fri, 4 Sep 2009 19:16:36 +0000 (21:16 +0200)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 4 Sep 2009 19:19:56 +0000 (20:19 +0100)
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 <r.schwebel@pengutronix.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/arm/pxa2xx-ac97.c

index 757b480bd5b509c116a82e0b084ca7f17a4af1ee..4e34d19ddbc0acb9e519e441f2d2a6a5246e0b99 100644 (file)
@@ -207,7 +207,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);