diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-04-25 16:20:10 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-04-25 16:20:10 -0400 |
| commit | 404e86e1550cc2c84bb57a372af784585c732f9a (patch) | |
| tree | c0e8e2d61c1b1c79705c0dc9f0f16e35267286e4 /net/tipc/socket.c | |
| parent | 0206e61b467fde4d7b50f1a64355182a4fd9576b (diff) | |
| parent | b9fa38f75ea7e1f64bc29653ca9758303ce698e4 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/tipc/socket.c')
| -rw-r--r-- | net/tipc/socket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 05853159536a..230f9ca2ad6b 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c | |||
| @@ -1756,8 +1756,8 @@ static int getsockopt(struct socket *sock, | |||
| 1756 | else if (len < sizeof(value)) { | 1756 | else if (len < sizeof(value)) { |
| 1757 | res = -EINVAL; | 1757 | res = -EINVAL; |
| 1758 | } | 1758 | } |
| 1759 | else if ((res = copy_to_user(ov, &value, sizeof(value)))) { | 1759 | else if (copy_to_user(ov, &value, sizeof(value))) { |
| 1760 | /* couldn't return value */ | 1760 | res = -EFAULT; |
| 1761 | } | 1761 | } |
| 1762 | else { | 1762 | else { |
| 1763 | res = put_user(sizeof(value), ol); | 1763 | res = put_user(sizeof(value), ol); |