From: Mauro Carvalho Chehab <mchehab@redhat.com>
To: unlisted-recipients:; (no To-header on input)@casper.infradead.org
Cc: Linux Media Mailing List <linux-media@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH 11/14] [media] uvcvideo: Use LINUX_VERSION_CODE for VIDIOC_QUERYCAP
Date: Sun, 26 Jun 2011 13:06:16 -0300 [thread overview]
Message-ID: <20110626130616.0d91dca7@pedra> (raw)
In-Reply-To: <cover.1309103285.git.mchehab@redhat.com>
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.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
diff --git a/drivers/media/video/uvc/uvc_driver.c b/drivers/media/video/uvc/uvc_driver.c
index b6eae48..749c722 100644
--- a/drivers/media/video/uvc/uvc_driver.c
+++ b/drivers/media/video/uvc/uvc_driver.c
@@ -31,6 +31,7 @@
#include <linux/videodev2.h>
#include <linux/vmalloc.h>
#include <linux/wait.h>
+#include <linux/version.h>
#include <asm/atomic.h>
#include <asm/unaligned.h>
@@ -1857,7 +1858,7 @@ static int uvc_probe(struct usb_interface *intf,
sizeof(dev->mdev.serial));
strcpy(dev->mdev.bus_info, udev->devpath);
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)
goto error;
diff --git a/drivers/media/video/uvc/uvc_v4l2.c b/drivers/media/video/uvc/uvc_v4l2.c
index 1fe2c8f..7f77528 100644
--- a/drivers/media/video/uvc/uvc_v4l2.c
+++ b/drivers/media/video/uvc/uvc_v4l2.c
@@ -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);
usb_make_path(stream->dev->udev,
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)
cap->capabilities = V4L2_CAP_VIDEO_CAPTURE
| V4L2_CAP_STREAMING;
diff --git a/drivers/media/video/uvc/uvcvideo.h b/drivers/media/video/uvc/uvcvideo.h
index 20107fd..df32a43 100644
--- a/drivers/media/video/uvc/uvcvideo.h
+++ b/drivers/media/video/uvc/uvcvideo.h
@@ -183,8 +183,7 @@ struct uvc_xu_control {
* Driver specific constants.
*/
-#define DRIVER_VERSION_NUMBER KERNEL_VERSION(1, 1, 0)
-#define DRIVER_VERSION "v1.1.0"
+#define DRIVER_VERSION "1.1.1"
/* Number of isochronous URBs. */
#define UVC_URBS 5
--
1.7.1
next prev parent reply other threads:[~2011-06-26 16:07 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1309103285.git.mchehab@redhat.com>
2011-06-26 16:06 ` [PATCH 03/14] [media] v4l2-ioctl: Add a default value for kernel version Mauro Carvalho Chehab
2011-06-26 16:06 ` [PATCH 05/14] [media] Stop using linux/version.h on most video drivers Mauro Carvalho Chehab
2011-06-26 16:06 ` [PATCH 01/14] [media] v4l2 core: return -ENOIOCTLCMD if an ioctl doesn't exist Mauro Carvalho Chehab
2011-06-27 2:49 ` Linus Torvalds
2011-06-26 16:06 ` [PATCH 13/14] [media] radio: Use the subsystem version control for VIDIOC_QUERYCAP Mauro Carvalho Chehab
2011-06-26 16:06 ` [PATCH 06/14] [media] pwc: Use the default version " Mauro Carvalho Chehab
2011-06-26 16:06 ` [PATCH 04/14] [media] drxd, siano: Remove unused include linux/version.h Mauro Carvalho Chehab
2011-06-26 16:06 ` [PATCH 07/14] [media] ivtv,cx18: Use default version control for VIDIOC_QUERYCAP Mauro Carvalho Chehab
2011-06-26 16:06 ` [PATCH 12/14] [media] Stop using linux/version.h the remaining video drivers Mauro Carvalho Chehab
2011-06-26 16:06 ` [PATCH 08/14] [media] et61x251: Use LINUX_VERSION_CODE for VIDIOC_QUERYCAP Mauro Carvalho Chehab
2011-06-26 16:06 ` [PATCH 09/14] [media] pvrusb2: " Mauro Carvalho Chehab
2011-06-26 16:06 ` [PATCH 10/14] [media] sn9c102: " Mauro Carvalho Chehab
2011-06-26 16:06 ` Mauro Carvalho Chehab [this message]
2011-06-27 1:14 ` [PATCH 11/14] [media] uvcvideo: " Laurent Pinchart
2011-06-26 16:06 ` [PATCH 14/14] [media] DocBook/v4l: Document the new system-wide version behavior Mauro Carvalho Chehab
2011-06-26 16:06 ` [PATCH 02/14] [media] return -ENOIOCTLCMD for unsupported ioctl's at legacy drivers Mauro Carvalho Chehab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110626130616.0d91dca7@pedra \
--to=mchehab@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox