Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

[karo-tx-linux.git] / fs / autofs4 / dev-ioctl.c

diff --git a/fs/autofs4/dev-ioctl.c b/fs/autofs4/dev-ioctl.c
index 625abf5422e2bb5f721b8921c0c89a2a5bec40a6..33bf8cbfd05172cc020200d4f4eec08d23eab420 100644 (file)
--- a/fs/autofs4/dev-ioctl.c
+++ b/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;