diff --git a/[refs] b/[refs]
index 3e4408cedcd6..63e357bc4ecb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 65fe42d6054bb84c4abc4168310bd5d7c462456e
+refs/heads/master: 41022fcb3db75c9777bbd05da114c7eb597694df
diff --git a/trunk/drivers/media/usb/hdpvr/hdpvr-video.c b/trunk/drivers/media/usb/hdpvr/hdpvr-video.c
index e30ece215c87..406eda85f610 100644
--- a/trunk/drivers/media/usb/hdpvr/hdpvr-video.c
+++ b/trunk/drivers/media/usb/hdpvr/hdpvr-video.c
@@ -538,9 +538,9 @@ static int vidioc_querycap(struct file *file, void  *priv,
 	strcpy(cap->driver, "hdpvr");
 	strcpy(cap->card, "Hauppauge HD PVR");
 	usb_make_path(dev->udev, cap->bus_info, sizeof(cap->bus_info));
-	cap->capabilities =     V4L2_CAP_VIDEO_CAPTURE |
-				V4L2_CAP_AUDIO         |
-				V4L2_CAP_READWRITE;
+	cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_AUDIO |
+			    V4L2_CAP_READWRITE;
+	cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
 	return 0;
 }