diff --git a/[refs] b/[refs]
index a5aa786cdc75..700bb6141146 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e18404adac2e8396335eb8e4cb380f619186042
+refs/heads/master: 4703d356e7890764c05328cc543d6507f132dfe6
diff --git a/trunk/drivers/media/platform/m2m-deinterlace.c b/trunk/drivers/media/platform/m2m-deinterlace.c
index c4ad9fca5dbf..45164c4f8452 100644
--- a/trunk/drivers/media/platform/m2m-deinterlace.c
+++ b/trunk/drivers/media/platform/m2m-deinterlace.c
@@ -456,8 +456,13 @@ static int vidioc_querycap(struct file *file, void *priv,
 	strlcpy(cap->driver, MEM2MEM_NAME, sizeof(cap->driver));
 	strlcpy(cap->card, MEM2MEM_NAME, sizeof(cap->card));
 	strlcpy(cap->bus_info, MEM2MEM_NAME, sizeof(cap->card));
-	cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OUTPUT
-			  | V4L2_CAP_STREAMING;
+	/*
+	 * This is only a mem-to-mem video device. The capture and output
+	 * device capability flags are left only for backward compatibility
+	 * and are scheduled for removal.
+	 */
+	cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OUTPUT |
+			   V4L2_CAP_VIDEO_M2M | V4L2_CAP_STREAMING;
 	cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
 
 	return 0;