From 7732af7ee7bb2adc7d2332794929d0b484b586bd Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@suse.de>
Date: Tue, 8 May 2007 00:31:38 -0700
Subject: [PATCH] --- yaml --- r: 54726 b: refs/heads/master c:
 83ae1b79c898838e16ac8cde69b39d22d36fb035 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 318d7098974d..5399f919455f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3e0975684337738997771416535d0e5d6fa27cd
+refs/heads/master: 83ae1b79c898838e16ac8cde69b39d22d36fb035
diff --git a/trunk/fs/compat_ioctl.c b/trunk/fs/compat_ioctl.c
index 6972d242fbdf..d92bc3eb7afc 100644
--- a/trunk/fs/compat_ioctl.c
+++ b/trunk/fs/compat_ioctl.c
@@ -684,8 +684,10 @@ static int hdio_getgeo(unsigned int fd, unsigned int cmd, unsigned long arg)
 	if (!err) {
 		err = copy_to_user (ugeo, &geo, 4);
 		err |= __put_user (geo.start, &ugeo->start);
+		if (err)
+			err = -EFAULT;
 	}
-	return err ? -EFAULT : 0;
+	return err;
 }
 
 static int hdio_ioctl_trans(unsigned int fd, unsigned int cmd, unsigned long arg)