---

yaml --- r: 311955 b: refs/heads/master c: 68d740d h: refs/heads/master i: 311953: df5cbf5 311951: d01b427 v: v3
git-mirror · Jul 14, 2012 · 4677717 · 4677717
1 parent fdd7ced
commit 4677717
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1daaa5e4ff2f09af58f9f7425bbd02e28f125d8e
+refs/heads/master: 68d740d79c4977a1a2197c6e68c618c8320c8ace
diff --git a/trunk/drivers/block/loop.c b/trunk/drivers/block/loop.c
@@ -1597,14 +1597,12 @@ static int loop_add(struct loop_device **l, int i)
 	struct gendisk *disk;
 	int err;
 
+	err = -ENOMEM;
 	lo = kzalloc(sizeof(*lo), GFP_KERNEL);
-	if (!lo) {
-		err = -ENOMEM;
+	if (!lo)
 		goto out;
-	}
 
-	err = idr_pre_get(&loop_index_idr, GFP_KERNEL);
-	if (err < 0)
+	if (!idr_pre_get(&loop_index_idr, GFP_KERNEL))
 		goto out_free_dev;
 
 	if (i >= 0) {