From 5b14ea68069a912b842f31c925f8ddc316be7094 Mon Sep 17 00:00:00 2001 From: Samuel Ortiz Date: Fri, 29 Jun 2012 12:03:55 +0200 Subject: [PATCH] --- yaml --- r: 315305 b: refs/heads/master c: c66433dc5dda15861dcbac63a97645771d14feb6 h: refs/heads/master i: 315303: 43acce6df5f7bd475f6fdd72105d3ca609699e88 v: v3 --- [refs] | 2 +- trunk/net/nfc/llcp/sock.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 58b028c36a01..1315f0e0c4fa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a831b9132065e1aa18acd7910d5f9c164a2f350f +refs/heads/master: c66433dc5dda15861dcbac63a97645771d14feb6 diff --git a/trunk/net/nfc/llcp/sock.c b/trunk/net/nfc/llcp/sock.c index e5d80142b825..6152d05f8378 100644 --- a/trunk/net/nfc/llcp/sock.c +++ b/trunk/net/nfc/llcp/sock.c @@ -78,11 +78,11 @@ static int llcp_sock_bind(struct socket *sock, struct sockaddr *addr, int alen) struct sockaddr_nfc_llcp llcp_addr; int len, ret = 0; - pr_debug("sk %p addr %p family %d\n", sk, addr, addr->sa_family); - if (!addr || addr->sa_family != AF_NFC) return -EINVAL; + pr_debug("sk %p addr %p family %d\n", sk, addr, addr->sa_family); + memset(&llcp_addr, 0, sizeof(llcp_addr)); len = min_t(unsigned int, sizeof(llcp_addr), alen); memcpy(&llcp_addr, addr, len);