projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'master-2014-12-08' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
[cascardo/linux.git]
/
net
/
ieee802154
/
dgram.c
diff --git
a/net/ieee802154/dgram.c
b/net/ieee802154/dgram.c
index
2c7a93e
..
d1930b7
100644
(file)
--- a/
net/ieee802154/dgram.c
+++ b/
net/ieee802154/dgram.c
@@
-154,7
+154,6
@@
static int dgram_ioctl(struct sock *sk, int cmd, unsigned long arg)
spin_unlock_bh(&sk->sk_receive_queue.lock);
return put_user(amount, (int __user *)arg);
}
-
}
return -ENOIOCTLCMD;