2 files changed, 7 insertions, 10 deletions

diff --git a/sound/atmel/abdac.c b/sound/atmel/abdac.c
index eb4ceb71123e..277ebce23a45 100644
--- a/sound/atmel/abdac.c
+++ b/sound/atmel/abdac.c
@@ -452,6 +452,7 @@ static int __devinit atmel_abdac_probe(struct platform_device *pdev)
         dac->regs = ioremap(regs->start, resource_size(regs));
         if (!dac->regs) {
                 dev_dbg(&pdev->dev, "could not remap register memory\n");
+                retval = -ENOMEM;
                 goto out_free_card;
         }
 
@@ -534,7 +535,7 @@ out_put_pclk:
         return retval;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int atmel_abdac_suspend(struct device *pdev)
 {
         struct snd_card *card = dev_get_drvdata(pdev);
diff --git a/sound/atmel/ac97c.c b/sound/atmel/ac97c.c
index bf47025bdf45..9052aff37f64 100644
--- a/sound/atmel/ac97c.c
+++ b/sound/atmel/ac97c.c
@@ -278,14 +278,9 @@ static int atmel_ac97c_capture_hw_params(struct snd_pcm_substream *substream,
         if (retval < 0)
                 return retval;
         /* snd_pcm_lib_malloc_pages returns 1 if buffer is changed. */
-        if (cpu_is_at32ap7000()) {
-                if (retval < 0)
-                        return retval;
-                /* snd_pcm_lib_malloc_pages returns 1 if buffer is changed. */
-                if (retval == 1)
-                        if (test_and_clear_bit(DMA_RX_READY, &chip->flags))
-                                dw_dma_cyclic_free(chip->dma.rx_chan);
-        }
+        if (cpu_is_at32ap7000() && retval == 1)
+                if (test_and_clear_bit(DMA_RX_READY, &chip->flags))
+                        dw_dma_cyclic_free(chip->dma.rx_chan);
 
         /* Set restrictions to params. */
         mutex_lock(&opened_mutex);
@@ -980,6 +975,7 @@ static int __devinit atmel_ac97c_probe(struct platform_device *pdev)
 
         if (!chip->regs) {
                 dev_dbg(&pdev->dev, "could not remap register memory\n");
+                retval = -ENOMEM;
                 goto err_ioremap;
         }
 
@@ -1134,7 +1130,7 @@ err_snd_card_new:
         return retval;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int atmel_ac97c_suspend(struct device *pdev)
 {
         struct snd_card *card = dev_get_drvdata(pdev);