From 57b6203d26dc015697c0bb20049f415a1d16680b Mon Sep 17 00:00:00 2001
From: Ian Kent <raven@themaw.net>
Date: Thu, 6 Nov 2008 12:53:23 -0800
Subject: [PATCH] --- yaml --- r: 118428 b: refs/heads/master c:
 96b0317906690997c16c7efffbc4c0fafcd6f7f2 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/fs/autofs4/dev-ioctl.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c95ddb7bed4e..0368b99f6555 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc9c4068388eea01d3b5da31016879f2341ecec5
+refs/heads/master: 96b0317906690997c16c7efffbc4c0fafcd6f7f2
diff --git a/trunk/fs/autofs4/dev-ioctl.c b/trunk/fs/autofs4/dev-ioctl.c
index 625abf5422e2..33bf8cbfd051 100644
--- a/trunk/fs/autofs4/dev-ioctl.c
+++ b/trunk/fs/autofs4/dev-ioctl.c
@@ -128,9 +128,10 @@ static inline void free_dev_ioctl(struct autofs_dev_ioctl *param)
  */
 static int validate_dev_ioctl(int cmd, struct autofs_dev_ioctl *param)
 {
-	int err = -EINVAL;
+	int err;
 
-	if (check_dev_ioctl_version(cmd, param)) {
+	err = check_dev_ioctl_version(cmd, param);
+	if (err) {
 		AUTOFS_WARN("invalid device control module version "
 		     "supplied for cmd(0x%08x)", cmd);
 		goto out;