projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[linux-2.6-block.git]
/
net
/
atm
/
ioctl.c
diff --git
a/net/atm/ioctl.c
b/net/atm/ioctl.c
index 8c2022c3e81dc05d0f9550e29c8bb9208fb4a4ac..8ccee4591f65f5571f4cfd8de770a0afd3e799f9 100644
(file)
--- 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 */