Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b46211f authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] cx23885: fix querycap 



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

Reported-by: default avatarJoseph Jasi <joe.yasi@gmail.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Cc: <stable@vger.kernel.org>      # for v3.19 and up
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent ab312030

drivers/media/pci/cx23885/cx23885-417.c

+6 −7
Original line number Diff line number Diff line
@@ -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;

}