Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

[firefly-linux-kernel-4.4.55.git] / net / nfc / llcp_core.c

diff --git a/net/nfc/llcp_core.c b/net/nfc/llcp_core.c
index b18f07ccb504c0f8c2aea36be80069a0376def76..98876274a1eea22b709403dde2c5702b1387a0be 100644 (file)
--- a/net/nfc/llcp_core.c
+++ b/net/nfc/llcp_core.c
@@ -934,7 +934,7 @@ static void nfc_llcp_recv_connect(struct nfc_llcp_local *local,
                sock->ssap = ssap;
        }
 
-       new_sk = nfc_llcp_sock_alloc(NULL, parent->sk_type, GFP_ATOMIC);
+       new_sk = nfc_llcp_sock_alloc(NULL, parent->sk_type, GFP_ATOMIC, 0);
        if (new_sk == NULL) {
                reason = LLCP_DM_REJ;
                release_sock(&sock->sk);