Merge remote-tracking branch 'wireless/master' into mac80211

[karo-tx-linux.git] / sound / atmel / abdac.c

diff --git a/sound/atmel/abdac.c b/sound/atmel/abdac.c
index eb4ceb71123e1aa91f9063fa57653befc5a7ef09..277ebce23a452be6cb027590eb997c278971eba8 100644 (file)
--- 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);