---

yaml --- r: 278962 b: refs/heads/master c: db81a62 h: refs/heads/master v: v3
git-mirror · Dec 14, 2011 · b9a2b79 · b9a2b79
1 parent fc0b980
commit b9a2b79
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: 94a098da42f258ae7019acbbea3bc5f93dc6f8f1
+refs/heads/master: db81a62451b24eaef59f41e6fb312a88e1a83454
diff --git a/trunk/net/nfc/rawsock.c b/trunk/net/nfc/rawsock.c
@@ -310,7 +310,7 @@ static int rawsock_create(struct net *net, struct socket *sock,
 
 	sock->ops = &rawsock_ops;
 
-	sk = sk_alloc(net, PF_NFC, GFP_KERNEL, nfc_proto->proto);
+	sk = sk_alloc(net, PF_NFC, GFP_ATOMIC, nfc_proto->proto);
 	if (!sk)
 		return -ENOMEM;