From 429cdd9a5bfd72ea11362863146ef194546820b5 Mon Sep 17 00:00:00 2001
From: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
Date: Thu, 27 Sep 2012 12:37:41 +0200
Subject: [PATCH] --- yaml --- r: 337039 b: refs/heads/master c:
 58b2c0ca0bd16ddefd1d981fe8748ca8083294c6 h: refs/heads/master i:   337037:
 5f6428af9961eeafb534fb99a73ebac40863294c   337035:
 e7135daf175fe32898ca2987d0bfe963ffc799a4   337031:
 33e8777233ee7a23b8365804836fb895a17469ea   337023:
 6da1d79141178e6d19a7a217876a663d857b1d57 v: v3

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

diff --git a/[refs] b/[refs]
index 54e9b780be84..d7f751436ed1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26c295cb4bd2a18f943a9962c6f954c8daee90f7
+refs/heads/master: 58b2c0ca0bd16ddefd1d981fe8748ca8083294c6
diff --git a/trunk/drivers/staging/ipack/ipack.c b/trunk/drivers/staging/ipack/ipack.c
index 5bd462b9e384..75bfecfe3620 100644
--- a/trunk/drivers/staging/ipack/ipack.c
+++ b/trunk/drivers/staging/ipack/ipack.c
@@ -355,7 +355,7 @@ static int ipack_device_read_id(struct ipack_device *dev)
 			dev->region[IPACK_ID_SPACE].size);
 	if (!idmem) {
 		dev_err(&dev->dev, "error mapping memory\n");
-		return ret;
+		return -ENOMEM;
 	}
 
 	/* Determine ID PROM Data Format.  If we find the ids "IPAC" or "IPAH"