diff --git a/[refs] b/[refs]
index 338fea4217c1..a28747a03f55 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c1d0f73021393dda4a226b5c4c86b2d730d656c
+refs/heads/master: 0df13d99f7c90e3f96408c0ba425e9fb1e48bbd3
diff --git a/trunk/drivers/media/pci/cx25821/cx25821-video.c b/trunk/drivers/media/pci/cx25821/cx25821-video.c
index d3cf259f19f9..dca339183672 100644
--- a/trunk/drivers/media/pci/cx25821/cx25821-video.c
+++ b/trunk/drivers/media/pci/cx25821/cx25821-video.c
@@ -719,7 +719,7 @@ static int cx25821_vidioc_querycap(struct file *file, void *priv,
 	struct cx25821_dev *dev = chan->dev;
 	const u32 cap_input = V4L2_CAP_VIDEO_CAPTURE |
 			V4L2_CAP_READWRITE | V4L2_CAP_STREAMING;
-	const u32 cap_output = V4L2_CAP_VIDEO_OUTPUT;
+	const u32 cap_output = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_READWRITE;
 
 	strcpy(cap->driver, "cx25821");
 	strlcpy(cap->card, cx25821_boards[dev->board].name, sizeof(cap->card));
@@ -728,7 +728,7 @@ static int cx25821_vidioc_querycap(struct file *file, void *priv,
 		cap->device_caps = cap_output;
 	else
 		cap->device_caps = cap_input;
-	cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
+	cap->capabilities = cap_input | cap_output | V4L2_CAP_DEVICE_CAPS;
 	return 0;
 }