summaryrefslogtreecommitdiff
path: root/net/nfc/rawsock.c
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2011-12-14 16:43:08 +0100
committerJohn W. Linville <linville@tuxdriver.com>2011-12-14 14:50:12 -0500
commitdb81a62451b24eaef59f41e6fb312a88e1a83454 (patch)
tree7d2f730daacb982db12a866d89bc119cc103d33c /net/nfc/rawsock.c
parent94a098da42f258ae7019acbbea3bc5f93dc6f8f1 (diff)
downloadlinux-3.10-db81a62451b24eaef59f41e6fb312a88e1a83454.tar.gz
linux-3.10-db81a62451b24eaef59f41e6fb312a88e1a83454.tar.bz2
linux-3.10-db81a62451b24eaef59f41e6fb312a88e1a83454.zip
NFC: Atomic socket allocation
rawsock_create() is called with preemption disabled, so we should not sleep. Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/nfc/rawsock.c')
-rw-r--r--net/nfc/rawsock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/nfc/rawsock.c b/net/nfc/rawsock.c
index 11ac0a17156..2e2f8c6a61f 100644
--- a/net/nfc/rawsock.c
+++ b/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;