---

yaml --- r: 327754 b: refs/heads/master c: 4a2c240 h: refs/heads/master v: v3
git-mirror · Aug 31, 2012 · 63af4b9 · 63af4b9
1 parent 7859aed
commit 63af4b9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f8bdecd32ab8f52bff1d646e2acb7c241d12a8d
+refs/heads/master: 4a2c240691bfdb9b08e680fb8af3f8c011c60e02
diff --git a/trunk/net/atm/resources.c b/trunk/net/atm/resources.c
@@ -432,7 +432,7 @@ int atm_dev_ioctl(unsigned int cmd, void __user *arg, int compat)
 			size = dev->ops->ioctl(dev, cmd, buf);
 		}
 		if (size < 0) {
-			error = (size == -ENOIOCTLCMD ? -EINVAL : size);
+			error = (size == -ENOIOCTLCMD ? -ENOTTY : size);
 			goto done;
 		}
 	}