From 093c05838c14d130b2b126536b37239e9a1ac141 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ZenIV.linux.org.uk>
Date: Fri, 6 Feb 2009 00:32:27 +0000
Subject: [PATCH] --- yaml --- r: 131006 b: refs/heads/master c:
 767b5828ad9a1b435488b5d39b5a66aeef4d25e4 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/fs/compat_ioctl.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c96948039f09..d96f3f44aaee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 082256333f4e879bc4b56e294921aaff6d035da0
+refs/heads/master: 767b5828ad9a1b435488b5d39b5a66aeef4d25e4
diff --git a/trunk/fs/compat_ioctl.c b/trunk/fs/compat_ioctl.c
index c8f8d5904f5e..9c6d815dd191 100644
--- a/trunk/fs/compat_ioctl.c
+++ b/trunk/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;