diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 23:52:26 -0600 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 23:52:26 -0600 |
| commit | 7baca6ad0ef09c8a78d798c93a3ce25336e8f50f (patch) | |
| tree | f3dd43243be6e840dc2b0386e91c4146a4f51620 /net/atm/ioctl.c | |
| parent | 06d8bf64ba25db42fcc60d2da2268ac22af94e77 (diff) | |
| parent | 17e0e27020d028a790d97699aff85a43af5be472 (diff) | |
Merge branch 'master' into for_paulus
Diffstat (limited to 'net/atm/ioctl.c')
| -rw-r--r-- | net/atm/ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/atm/ioctl.c b/net/atm/ioctl.c index 8c2022c3e81d..8ccee4591f65 100644 --- a/net/atm/ioctl.c +++ b/net/atm/ioctl.c @@ -76,7 +76,7 @@ int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) } skb = skb_peek(&sk->sk_receive_queue); error = put_user(skb ? skb->len : 0, - (int __user *)argp) ? -EFAULT : 0; + (int __user *)argp) ? -EFAULT : 0; goto done; } case SIOCGSTAMP: /* borrowed from IP */ |