---

yaml --- r: 203959 b: refs/heads/master c: e2e0c7c h: refs/heads/master i: 203957: 7a4a05e 203955: 9681061 203951: 8296ebf v: v3
git-mirror · Aug 1, 2010 · 4e5639d · 4e5639d
1 parent ead51c6
commit 4e5639d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0fc48c37ff3969dde71a43fa7c8f176d4bd90a3e
+refs/heads/master: e2e0c7c9ddbe6b79fe647aca5eea3a405d38ada4
diff --git a/trunk/net/rose/rose_route.c b/trunk/net/rose/rose_route.c
@@ -109,7 +109,9 @@ static int __must_check rose_add_node(struct rose_route_struct *rose_route,
 		init_timer(&rose_neigh->t0timer);
 
 		if (rose_route->ndigis != 0) {
-			if ((rose_neigh->digipeat = kmalloc(sizeof(ax25_digi), GFP_KERNEL)) == NULL) {
+			rose_neigh->digipeat =
+				kmalloc(sizeof(ax25_digi), GFP_ATOMIC);
+			if (rose_neigh->digipeat == NULL) {
 				kfree(rose_neigh);
 				res = -ENOMEM;
 				goto out;