2 files changed, 13 insertions, 0 deletions

diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c
index 9c12563db1c4..b4b48afb6de6 100644
--- a/sound/arm/pxa2xx-ac97.c
+++ b/sound/arm/pxa2xx-ac97.c
@@ -171,6 +171,13 @@ static int __devinit pxa2xx_ac97_probe(struct platform_device *dev)
         struct snd_ac97_bus *ac97_bus;
         struct snd_ac97_template ac97_template;
         int ret;
+        pxa2xx_audio_ops_t *pdata = dev->dev.platform_data;
+
+        if (dev->id >= 0) {
+                dev_err(&dev->dev, "PXA2xx has only one AC97 port.\n");
+                ret = -ENXIO;
+                goto err_dev;
+        }
 
         ret = snd_card_create(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,
                               THIS_MODULE, 0, &card);
@@ -201,6 +208,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_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);
         if (ret == 0) {
@@ -213,6 +222,7 @@ err_remove:
 err:
         if (card)
                 snd_card_free(card);
+err_dev:
         return ret;
 }
 
diff --git a/sound/arm/pxa2xx-pcm-lib.c b/sound/arm/pxa2xx-pcm-lib.c
index 6205f37d547c..743ac6a29065 100644
--- a/sound/arm/pxa2xx-pcm-lib.c
+++ b/sound/arm/pxa2xx-pcm-lib.c
@@ -136,6 +136,9 @@ int __pxa2xx_pcm_prepare(struct snd_pcm_substream *substream)
 {
         struct pxa2xx_runtime_data *prtd = substream->runtime->private_data;
 
+        if (!prtd || !prtd->params)
+                return 0;
+
         DCSR(prtd->dma_ch) &= ~DCSR_RUN;
         DCSR(prtd->dma_ch) = 0;
         DCMD(prtd->dma_ch) = 0;