cx23885: fix querycap

PATCH Superseded Hans Verkuil 1 participant 1 message Mar 8, 2015 Media (V4L/DVB)

lore

Share & tools

lore

Hans Verkuil

author

2015-03-08 17:53 UTC #0 lore raw

PATCH 1/1 cx23885: fix querycap

cap->device_caps wasn't set in cx23885-417.c causing a warning from the v4l2-core.

Reported-by Joseph Jasi <[email protected]>

Signed-off-by Hans Verkuil <[email protected]>

drivers/media/pci/cx23885/cx23885-417.c +4 -6

index e4901a5..9cb92c6 100644
@@ -1340,13 +1340,11 @@ static int vidioc_querycap(struct file *file, void  *priv,
 	strlcpy(cap->card, cx23885_boards[tsport->dev->board].name,
 		sizeof(cap->card));
 	sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci));
-	cap->capabilities =
-		V4L2_CAP_VIDEO_CAPTURE |
-		V4L2_CAP_READWRITE     |
-		V4L2_CAP_STREAMING     |
-		0;
+	cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE |
+			   V4L2_CAP_STREAMING;
 	if (dev->tuner_type != TUNER_ABSENT)
-		cap->capabilities |= V4L2_CAP_TUNER;
+		cap->device_caps |= V4L2_CAP_TUNER;
+	cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
 
 	return 0;
 }