Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	sound/core/memalloc.c

1 files changed, 3 insertions, 3 deletions

diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c
index b0a474494966..89096e811a4b 100644
--- a/sound/arm/aaci.c
+++ b/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;
         }