diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-03-28 13:53:10 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-03-28 13:53:10 +0900 |
| commit | 18af30e259c25a64ad69bb749c661564bc886275 (patch) | |
| tree | 996c89594fd20f25fcc15b5843625d99473f6982 /net/bluetooth/hidp/sock.c | |
| parent | 691c01c3f0b3252308162de90edcd02f7ca1733c (diff) | |
| parent | 6658a6991cef75719a21441aa0b7f8d6821534ee (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-latest
Diffstat (limited to 'net/bluetooth/hidp/sock.c')
| -rw-r--r-- | net/bluetooth/hidp/sock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/bluetooth/hidp/sock.c b/net/bluetooth/hidp/sock.c index 178ac7f127a..73a32d705c1 100644 --- a/net/bluetooth/hidp/sock.c +++ b/net/bluetooth/hidp/sock.c @@ -160,10 +160,10 @@ static int hidp_sock_compat_ioctl(struct socket *sock, unsigned int cmd, unsigne { if (cmd == HIDPGETCONNLIST) { struct hidp_connlist_req cl; - uint32_t uci; + u32 uci; int err; - if (get_user(cl.cnum, (uint32_t __user *) arg) || + if (get_user(cl.cnum, (u32 __user *) arg) || get_user(uci, (u32 __user *) (arg + 4))) return -EFAULT; @@ -174,7 +174,7 @@ static int hidp_sock_compat_ioctl(struct socket *sock, unsigned int cmd, unsigne err = hidp_get_connlist(&cl); - if (!err && put_user(cl.cnum, (uint32_t __user *) arg)) + if (!err && put_user(cl.cnum, (u32 __user *) arg)) err = -EFAULT; return err; |