diff options
| author | Kevin Hilman <khilman@linaro.org> | 2013-06-28 11:17:48 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-29 13:24:29 +0100 |
| commit | 7685e0165b36ae034dd5e67b7fbbee7e74604f38 (patch) | |
| tree | 94f7303a9f83659996c7fc63affb1ce5ac58a4d6 /sound/soc/pxa | |
| parent | 8a08f4c4f24b4dfe7ff08542868e2b434c96221f (diff) | |
| download | linux-7685e0165b36ae034dd5e67b7fbbee7e74604f38.tar.gz linux-7685e0165b36ae034dd5e67b7fbbee7e74604f38.tar.bz2 linux-7685e0165b36ae034dd5e67b7fbbee7e74604f38.zip | |
ASoC: pxa2xx: fixup multi-platform AC'97 build failures
commit b047e1cc (ASoC: ac97: Support multi-platform AC'97) introduced
some build failures for the pxa2xx-ac97 support, fix them.
Cc: Mark Brown <broonie@linaro.org>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/pxa')
| -rw-r--r-- | sound/soc/pxa/pxa2xx-ac97.c | 2 | ||||
| -rw-r--r-- | sound/soc/pxa/pxa2xx-ac97.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c index a3c22ba25f08..1475515712e6 100644 --- a/sound/soc/pxa/pxa2xx-ac97.c +++ b/sound/soc/pxa/pxa2xx-ac97.c @@ -238,6 +238,8 @@ static const struct snd_soc_component_driver pxa_ac97_component = { static int pxa2xx_ac97_dev_probe(struct platform_device *pdev) { + int ret; + if (pdev->id != -1) { dev_err(&pdev->dev, "PXA2xx has only one AC97 port.\n"); return -ENXIO; diff --git a/sound/soc/pxa/pxa2xx-ac97.h b/sound/soc/pxa/pxa2xx-ac97.h index eda891e6f31b..a49c21ba3842 100644 --- a/sound/soc/pxa/pxa2xx-ac97.h +++ b/sound/soc/pxa/pxa2xx-ac97.h @@ -14,7 +14,4 @@ #define PXA2XX_DAI_AC97_AUX 1 #define PXA2XX_DAI_AC97_MIC 2 -/* platform data */ -extern struct snd_ac97_bus_ops pxa2xx_ac97_ops; - #endif |