diff --git a/[refs] b/[refs]
index 112c14ff65ef..89662e8b0c1b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 08256ea0da18db20f2edc2e8c935cf74c33ad564
+refs/heads/master: 61c310dc1e2a34bced25b4fa7609316d6755ccc2
diff --git a/trunk/drivers/media/video/v4l2-int-device.c b/trunk/drivers/media/video/v4l2-int-device.c
index 7ad8700ebdea..f497c9458344 100644
--- a/trunk/drivers/media/video/v4l2-int-device.c
+++ b/trunk/drivers/media/video/v4l2-int-device.c
@@ -143,7 +143,7 @@ static v4l2_int_ioctl_func *find_ioctl(struct v4l2_int_slave *slave, int cmd,
 
 static int no_such_ioctl_0(struct v4l2_int_device *d)
 {
-	return -EINVAL;
+	return -ENOIOCTLCMD;
 }
 
 int v4l2_int_ioctl_0(struct v4l2_int_device *d, int cmd)
@@ -155,7 +155,7 @@ int v4l2_int_ioctl_0(struct v4l2_int_device *d, int cmd)
 
 static int no_such_ioctl_1(struct v4l2_int_device *d, void *arg)
 {
-	return -EINVAL;
+	return -ENOIOCTLCMD;
 }
 
 int v4l2_int_ioctl_1(struct v4l2_int_device *d, int cmd, void *arg)