diff options
| author | David S. Miller <davem@davemloft.net> | 2012-03-07 22:53:48 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-03-07 22:53:48 -0800 |
| commit | 0111ad823e5e261ffc54ef728f1d852760ee4920 (patch) | |
| tree | 3fa6912f040765a447e7b4e25a4918b2d006d7a5 /net/bluetooth/cmtp/sock.c | |
| parent | e427babeefe10023d348e2a3db272612d6e79dc3 (diff) | |
| parent | fdde0a26a218d95e2ea38c0838ab6f24040af14c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next
Diffstat (limited to 'net/bluetooth/cmtp/sock.c')
| -rw-r--r-- | net/bluetooth/cmtp/sock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/bluetooth/cmtp/sock.c b/net/bluetooth/cmtp/sock.c index 3f2dd5c25ae..1230faaac29 100644 --- a/net/bluetooth/cmtp/sock.c +++ b/net/bluetooth/cmtp/sock.c @@ -137,10 +137,10 @@ static int cmtp_sock_compat_ioctl(struct socket *sock, unsigned int cmd, unsigne { if (cmd == CMTPGETCONNLIST) { struct cmtp_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; @@ -151,7 +151,7 @@ static int cmtp_sock_compat_ioctl(struct socket *sock, unsigned int cmd, unsigne err = cmtp_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; |