diff --git a/[refs] b/[refs]
index f2e4e06f53dc..0d73cd20916b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35311d6478077f7bfe35c1c653193e658bf32686
+refs/heads/master: d99901d6fdfb4098b9996de89ffbbae890e08288
diff --git a/trunk/fs/compat_ioctl.c b/trunk/fs/compat_ioctl.c
index 155e612635f1..e28a74203f3b 100644
--- a/trunk/fs/compat_ioctl.c
+++ b/trunk/fs/compat_ioctl.c
@@ -798,13 +798,16 @@ static int routing_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg)
 		r = (void *) &r4;
 	}
 
-	if (ret)
-		return -EFAULT;
+	if (ret) {
+		ret = -EFAULT;
+		goto out;
+	}
 
 	set_fs (KERNEL_DS);
 	ret = sys_ioctl (fd, cmd, (unsigned long) r);
 	set_fs (old_fs);
 
+out:
 	if (mysock)
 		sockfd_put(mysock);