Skip to contentSkip to conversation

cx23885: fix querycap

PATCH New Hans Verkuil 1 participant 1 message Mar 9, 2015 Media (V4L/DVB)

lore
Share & tools
lore

Hans Verkuil

author
#0 lore raw

PATCH v2 1/1 cx23885: fix querycap

Changes in v2:

- PCI -> PCIe
- expand cap->capabilities with all capabilities since these are global capabilities.

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 +6 -7
index e4901a5..63c0ee5 100644
@@ -1339,14 +1339,13 @@ static int vidioc_querycap(struct file *file, void  *priv,
 	strlcpy(cap->driver, dev->name, sizeof(cap->driver));
 	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;
+	sprintf(cap->bus_info, "PCIe:%s", pci_name(dev->pci));
+	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_VBI_CAPTURE |
+		V4L2_CAP_AUDIO | V4L2_CAP_DEVICE_CAPS;
 
 	return 0;
 }