From 8aede73c97d96011ec4c3a57cad8e7f3b49ca07f Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Sat, 4 Aug 2012 23:52:36 +0000
Subject: [PATCH] --- yaml --- r: 321492 b: refs/heads/master c:
 f716168b8aee528cf685246f0e7247aa0d08b79c h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/atm/iphase.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 84c028d2f181..5ebcdac23b6f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e7dfbc8d1ea9ca9058aa641a8fe795ebca320e2
+refs/heads/master: f716168b8aee528cf685246f0e7247aa0d08b79c
diff --git a/trunk/drivers/atm/iphase.c b/trunk/drivers/atm/iphase.c
index d4386019af5d..96cce6d53195 100644
--- a/trunk/drivers/atm/iphase.c
+++ b/trunk/drivers/atm/iphase.c
@@ -2362,7 +2362,7 @@ static int __devinit ia_init(struct atm_dev *dev)
 	{  
 		printk(DEV_LABEL " (itf %d): can't set up page mapping\n",  
 			    dev->number);  
-		return error;  
+		return -ENOMEM;
 	}  
 	IF_INIT(printk(DEV_LABEL " (itf %d): rev.%d,base=%p,irq=%d\n",  
 			dev->number, iadev->pci->revision, base, iadev->irq);)