mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-07 06:36:38 +07:00
[media] stk-webcam: fix querycap and simplify s_input
Add device_caps support to querycap, fill in bus_info correctly and do not set the version field (let the core handle that). Also simplify the s_input ioctl. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Tested-by: Arvydas Sidorenko <asido4@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
89ea47069c
commit
b27763f0fa
@ -768,12 +768,15 @@ static int v4l_stk_mmap(struct file *fp, struct vm_area_struct *vma)
|
||||
static int stk_vidioc_querycap(struct file *filp,
|
||||
void *priv, struct v4l2_capability *cap)
|
||||
{
|
||||
struct stk_camera *dev = video_drvdata(filp);
|
||||
|
||||
strcpy(cap->driver, "stk");
|
||||
strcpy(cap->card, "stk");
|
||||
cap->version = DRIVER_VERSION_NUM;
|
||||
usb_make_path(dev->udev, cap->bus_info, sizeof(cap->bus_info));
|
||||
|
||||
cap->capabilities = V4L2_CAP_VIDEO_CAPTURE
|
||||
cap->device_caps = V4L2_CAP_VIDEO_CAPTURE
|
||||
| V4L2_CAP_READWRITE | V4L2_CAP_STREAMING;
|
||||
cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -797,10 +800,7 @@ static int stk_vidioc_g_input(struct file *filp, void *priv, unsigned int *i)
|
||||
|
||||
static int stk_vidioc_s_input(struct file *filp, void *priv, unsigned int i)
|
||||
{
|
||||
if (i != 0)
|
||||
return -EINVAL;
|
||||
else
|
||||
return 0;
|
||||
return i ? -EINVAL : 0;
|
||||
}
|
||||
|
||||
static int stk_s_ctrl(struct v4l2_ctrl *ctrl)
|
||||
|
Loading…
Reference in New Issue
Block a user