NFC: Atomic socket allocation
authorSamuel Ortiz <sameo@linux.intel.com>
Wed, 14 Dec 2011 15:43:08 +0000 (16:43 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 14 Dec 2011 19:50:12 +0000 (14:50 -0500)
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>
net/nfc/rawsock.c

index 11ac0a17156e57513de11799ccbcadb8dba7b691..2e2f8c6a61fe90579486c553032d14af2a7f0588 100644 (file)
@@ -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;