---

yaml --- r: 54726 b: refs/heads/master c: 83ae1b7 h: refs/heads/master v: v3
git-mirror · May 8, 2007 · 7732af7 · 7732af7
1 parent 8b94e94
commit 7732af7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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)