Commit fd3e5824 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

[media] uvcvideo: Use LINUX_VERSION_CODE for VIDIOC_QUERYCAP

uvcvideo doesn't use vidioc_ioctl2. As the API is changing to use
a common version for all drivers, we need to expliticly fix this
driver.
Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 6c13b45e
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include <linux/videodev2.h> #include <linux/videodev2.h>
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <linux/version.h>
#include <asm/atomic.h> #include <asm/atomic.h>
#include <asm/unaligned.h> #include <asm/unaligned.h>
...@@ -1857,7 +1858,7 @@ static int uvc_probe(struct usb_interface *intf, ...@@ -1857,7 +1858,7 @@ static int uvc_probe(struct usb_interface *intf,
sizeof(dev->mdev.serial)); sizeof(dev->mdev.serial));
strcpy(dev->mdev.bus_info, udev->devpath); strcpy(dev->mdev.bus_info, udev->devpath);
dev->mdev.hw_revision = le16_to_cpu(udev->descriptor.bcdDevice); dev->mdev.hw_revision = le16_to_cpu(udev->descriptor.bcdDevice);
dev->mdev.driver_version = DRIVER_VERSION_NUMBER; dev->mdev.driver_version = LINUX_VERSION_CODE;
if (media_device_register(&dev->mdev) < 0) if (media_device_register(&dev->mdev) < 0)
goto error; goto error;
......
...@@ -571,7 +571,7 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg) ...@@ -571,7 +571,7 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg)
strlcpy(cap->card, vdev->name, sizeof cap->card); strlcpy(cap->card, vdev->name, sizeof cap->card);
usb_make_path(stream->dev->udev, usb_make_path(stream->dev->udev,
cap->bus_info, sizeof(cap->bus_info)); cap->bus_info, sizeof(cap->bus_info));
cap->version = DRIVER_VERSION_NUMBER; cap->version = LINUX_VERSION_CODE;
if (stream->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) if (stream->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
cap->capabilities = V4L2_CAP_VIDEO_CAPTURE cap->capabilities = V4L2_CAP_VIDEO_CAPTURE
| V4L2_CAP_STREAMING; | V4L2_CAP_STREAMING;
......
...@@ -183,8 +183,7 @@ struct uvc_xu_control { ...@@ -183,8 +183,7 @@ struct uvc_xu_control {
* Driver specific constants. * Driver specific constants.
*/ */
#define DRIVER_VERSION_NUMBER KERNEL_VERSION(1, 1, 0) #define DRIVER_VERSION "1.1.1"
#define DRIVER_VERSION "v1.1.0"
/* Number of isochronous URBs. */ /* Number of isochronous URBs. */
#define UVC_URBS 5 #define UVC_URBS 5
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment