Commit db81a624 authored by Samuel Ortiz's avatar Samuel Ortiz Committed by John W. Linville
Browse files

NFC: Atomic socket allocation 



rawsock_create() is called with preemption disabled, so we should not
sleep.

Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 94a098da

net/nfc/rawsock.c

+1 −1
Original line number Diff line number Diff line
@@ -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;