diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-22 19:32:00 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-22 19:32:00 +0100 |
| commit | 3384fb98845dc014770caa224d61a2effd258ca5 (patch) | |
| tree | 8189134a4938632e2d06e93af04c9fc1f3c2d4c9 /net/nfc/rawsock.c | |
| parent | 8cfc545e0e3e6cc82acfdc79321b41eeeab0ca45 (diff) | |
| parent | ade7515fefad9af13f6dd469f35bb413b6a5b473 (diff) | |
Merge branch 'regulator-drivers' into regulator-next
Diffstat (limited to 'net/nfc/rawsock.c')
| -rw-r--r-- | net/nfc/rawsock.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/nfc/rawsock.c b/net/nfc/rawsock.c index ec1134c9e07..8b8a6a2b2ba 100644 --- a/net/nfc/rawsock.c +++ b/net/nfc/rawsock.c @@ -54,7 +54,10 @@ static int rawsock_release(struct socket *sock) { struct sock *sk = sock->sk; - pr_debug("sock=%p\n", sock); + pr_debug("sock=%p sk=%p\n", sock, sk); + + if (!sk) + return 0; sock_orphan(sk); sock_put(sk); |