diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-06-12 14:09:59 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-06-12 14:11:13 -0400 |
| commit | a59f975a78f0606a3a364939dfa9b949d5f87521 (patch) | |
| tree | 42ef7708cdec5263026a5e1e84d960d6ba20844f /net/nfc | |
| parent | 7f0d9f430dc99303558adc30a75eef10c43f7bec (diff) | |
| parent | 6aee4ca3d2217d3f76469e5ed576d62695f0912a (diff) | |
| download | linux-a59f975a78f0606a3a364939dfa9b949d5f87521.tar.gz linux-a59f975a78f0606a3a364939dfa9b949d5f87521.tar.bz2 linux-a59f975a78f0606a3a364939dfa9b949d5f87521.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
MAINTAINERS
drivers/net/wireless/iwlwifi/pcie/trans.c
Diffstat (limited to 'net/nfc')
| -rw-r--r-- | net/nfc/llcp/sock.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/nfc/llcp/sock.c b/net/nfc/llcp/sock.c index 30e3cc71be7a..2c0b317344b7 100644 --- a/net/nfc/llcp/sock.c +++ b/net/nfc/llcp/sock.c @@ -292,6 +292,9 @@ static int llcp_sock_getname(struct socket *sock, struct sockaddr *addr, pr_debug("%p\n", sk); + if (llcp_sock == NULL) + return -EBADFD; + addr->sa_family = AF_NFC; *len = sizeof(struct sockaddr_nfc_llcp); |