summary refs log tree commit diff
diff options
context:
space:
mode:
authorAl Viro <viro@ZenIV.linux.org.uk>2009-02-06 00:32:27 +0000
committerLinus Torvalds <torvalds@linux-foundation.org>2009-02-05 16:35:52 -0800
commit767b5828ad9a1b435488b5d39b5a66aeef4d25e4 (patch)
tree40dc54bb63899ff8fd2de31dfeb83230bddad935
parent082256333f4e879bc4b56e294921aaff6d035da0 (diff)
downloadlinux-767b5828ad9a1b435488b5d39b5a66aeef4d25e4.tar.gz
braino in sg_ioctl_trans()
... and yes, gcc is insane enough to eat that without complaint.
We probably want sparse to scream on those...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--fs/compat_ioctl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
index c8f8d5904f5e..9c6d815dd191 100644
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
@@ -785,7 +785,7 @@ static int sg_ioctl_trans(unsigned int fd, unsigned int cmd, unsigned long arg)
 
 	if (copy_in_user(&sgio->status, &sgio32->status,
 			 (4 * sizeof(unsigned char)) +
-			 (2 * sizeof(unsigned (short))) +
+			 (2 * sizeof(unsigned short)) +
 			 (3 * sizeof(int))))
 		return -EFAULT;