---

yaml --- r: 337039 b: refs/heads/master c: 58b2c0c h: refs/heads/master i: 337037: 5f6428a 337035: e7135da 337031: 33e8777 337023: 6da1d79 v: v3
git-mirror · Oct 19, 2012 · 429cdd9 · 429cdd9
1 parent 64605b8
commit 429cdd9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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"