diff options
| -rw-r--r-- | drivers/media/usb/stkwebcam/stk-webcam.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/usb/stkwebcam/stk-webcam.c b/drivers/media/usb/stkwebcam/stk-webcam.c index c07366619227..a00edf3de6bd 100644 --- a/drivers/media/usb/stkwebcam/stk-webcam.c +++ b/drivers/media/usb/stkwebcam/stk-webcam.c | |||
| @@ -768,12 +768,15 @@ static int v4l_stk_mmap(struct file *fp, struct vm_area_struct *vma) | |||
| 768 | static int stk_vidioc_querycap(struct file *filp, | 768 | static int stk_vidioc_querycap(struct file *filp, |
| 769 | void *priv, struct v4l2_capability *cap) | 769 | void *priv, struct v4l2_capability *cap) |
| 770 | { | 770 | { |
| 771 | struct stk_camera *dev = video_drvdata(filp); | ||
| 772 | |||
| 771 | strcpy(cap->driver, "stk"); | 773 | strcpy(cap->driver, "stk"); |
| 772 | strcpy(cap->card, "stk"); | 774 | strcpy(cap->card, "stk"); |
| 773 | cap->version = DRIVER_VERSION_NUM; | 775 | usb_make_path(dev->udev, cap->bus_info, sizeof(cap->bus_info)); |
| 774 | 776 | ||
| 775 | cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | 777 | cap->device_caps = V4L2_CAP_VIDEO_CAPTURE |
| 776 | | V4L2_CAP_READWRITE | V4L2_CAP_STREAMING; | 778 | | V4L2_CAP_READWRITE | V4L2_CAP_STREAMING; |
| 779 | cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; | ||
| 777 | return 0; | 780 | return 0; |
| 778 | } | 781 | } |
| 779 | 782 | ||
| @@ -797,10 +800,7 @@ static int stk_vidioc_g_input(struct file *filp, void *priv, unsigned int *i) | |||
| 797 | 800 | ||
| 798 | static int stk_vidioc_s_input(struct file *filp, void *priv, unsigned int i) | 801 | static int stk_vidioc_s_input(struct file *filp, void *priv, unsigned int i) |
| 799 | { | 802 | { |
| 800 | if (i != 0) | 803 | return i ? -EINVAL : 0; |
| 801 | return -EINVAL; | ||
| 802 | else | ||
| 803 | return 0; | ||
| 804 | } | 804 | } |
| 805 | 805 | ||
| 806 | static int stk_s_ctrl(struct v4l2_ctrl *ctrl) | 806 | static int stk_s_ctrl(struct v4l2_ctrl *ctrl) |