diff --git a/[refs] b/[refs]
index 8abb71eef36b..804efc8f8a35 100644
--- 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
index 23f45ce6f351..0447d5d0b639 100644
--- 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;
 		}
 	}