From bd2781f2207afbb72898f677a070c0476cc9a197 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 1 Sep 2008 15:31:50 +0200
Subject: [PATCH] --- yaml --- r: 110958 b: refs/heads/master c:
 631e8ad428c45ba7ab34df91d1db6cb7bf74d526 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/sound/arm/aaci.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 2a5bbf142223..eb069fd00d27 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d695e4ea860fc1cbe1e4b101af4e0450219f2db9
+refs/heads/master: 631e8ad428c45ba7ab34df91d1db6cb7bf74d526
diff --git a/trunk/sound/arm/aaci.c b/trunk/sound/arm/aaci.c
index b0a474494966..89096e811a4b 100644
--- a/trunk/sound/arm/aaci.c
+++ b/trunk/sound/arm/aaci.c
@@ -999,7 +999,7 @@ static struct aaci * __devinit aaci_init_card(struct amba_device *dev)
 	card = snd_card_new(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,
 			    THIS_MODULE, sizeof(struct aaci));
 	if (card == NULL)
-		return ERR_PTR(-ENOMEM);
+		return NULL;
 
 	card->private_free = aaci_free_card;
 
@@ -1083,8 +1083,8 @@ static int __devinit aaci_probe(struct amba_device *dev, void *id)
 		return ret;
 
 	aaci = aaci_init_card(dev);
-	if (IS_ERR(aaci)) {
-		ret = PTR_ERR(aaci);
+	if (!aaci) {
+		ret = -ENOMEM;
 		goto out;
 	}