diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-07-01 11:23:13 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-07-01 11:23:13 +0200 |
| commit | ef866ac0c29223d01ce751bb342d8f4fa1b2580a (patch) | |
| tree | f6e006b369f08f379fa0c164ff34783daf02215a /sound/soc/pxa | |
| parent | bc32134c0523c60989d2f2439e176601668a62a5 (diff) | |
| parent | 370887f105025ed52acc9cbb0a15b6567d1550ff (diff) | |
| download | blackbird-op-linux-ef866ac0c29223d01ce751bb342d8f4fa1b2580a.tar.gz blackbird-op-linux-ef866ac0c29223d01ce751bb342d8f4fa1b2580a.zip | |
Merge tag 'asoc-v3.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Final updates for v3.11
A few final updates:
- A couple of additional bug fixes for the AC'97 refactoring.
- Some fixes for the ADAU1701 driver.
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 |
