diff options
| author | Wolfram Sang <w.sang@pengutronix.de> | 2012-10-08 14:46:32 +0400 |
|---|---|---|
| committer | Wolfram Sang <w.sang@pengutronix.de> | 2012-10-08 14:46:32 +0400 |
| commit | 102084d3d3969646cc89ea159e50898aeafc6649 (patch) | |
| tree | e92924469b3fab3ee6fa29e338e0a3a4cb167e82 /net/bluetooth/hidp/sock.c | |
| parent | 6ccbe607132bd823abbad8d32b13af89161707da (diff) | |
| parent | 979570e02981d4a8fc20b3cc8fd651856c98ee9d (diff) | |
| download | linux-102084d3d3969646cc89ea159e50898aeafc6649.tar.xz | |
Merge tag 'v3.6-rc7' into i2c-embedded/for-next
Linux 3.6-rc7
Needed to get updates from i2c-embedded/for-current into i2c-embedded/for-next
Diffstat (limited to 'net/bluetooth/hidp/sock.c')
| -rw-r--r-- | net/bluetooth/hidp/sock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/hidp/sock.c b/net/bluetooth/hidp/sock.c index 18b3f6892a36..b24fb3bd8625 100644 --- a/net/bluetooth/hidp/sock.c +++ b/net/bluetooth/hidp/sock.c @@ -56,7 +56,7 @@ static int hidp_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long switch (cmd) { case HIDPCONNADD: if (!capable(CAP_NET_ADMIN)) - return -EACCES; + return -EPERM; if (copy_from_user(&ca, argp, sizeof(ca))) return -EFAULT; @@ -91,7 +91,7 @@ static int hidp_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long case HIDPCONNDEL: if (!capable(CAP_NET_ADMIN)) - return -EACCES; + return -EPERM; if (copy_from_user(&cd, argp, sizeof(cd))) return -EFAULT; |