[RFC PATCH 6/8] stk-webcam: fix querycap and simplify s_input.

[Hans Verkuil]

From: Hans Verkuil <hans.verk...@cisco.com>

Add device_caps support to querycap and do not set the version field (let the
core handle that).

Also simplify the s_input ioctl.

Signed-off-by: Hans Verkuil <hans.verk...@cisco.com>
---
 drivers/media/usb/stkwebcam/stk-webcam.c |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/drivers/media/usb/stkwebcam/stk-webcam.c 
b/drivers/media/usb/stkwebcam/stk-webcam.c
index a7882d6..a654578 100644
--- a/drivers/media/usb/stkwebcam/stk-webcam.c
+++ b/drivers/media/usb/stkwebcam/stk-webcam.c
@@ -730,12 +730,16 @@ 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;
+       strlcpy(cap->bus_info, dev_name(&dev->udev->dev),
+               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;
 }
 
@@ -759,10 +763,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)
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html