Commit 880c35c5 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] pwc: Use the default version for VIDIOC_QUERYCAP 



After discussing with Hans, change pwc to use the default version
control.

The only version ever used for pwc driver is 10.0.12, due to
commit 2b455db6.

Changing it to 3.x.y won't conflict with the old version.
There's no namespace conflicts in any predictable future.

Even on the remote far-away case where we might have a conflict,
it will be on just one specific stable Kernel release (Kernel 10.0.12),
if we ever have such stable release.

So, it is safe and consistent on using 3.x.y numering schema for
it.

Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 1990d50b

drivers/media/video/pwc/pwc-v4l.c

+0 −1
Original line number Diff line number Diff line
@@ -349,7 +349,6 @@ static int pwc_querycap(struct file *file, void *fh, struct v4l2_capability *cap 
	strcpy(cap->driver, PWC_NAME);

	strlcpy(cap->card, vdev->name, sizeof(cap->card));

	usb_make_path(pdev->udev, cap->bus_info, sizeof(cap->bus_info));

	cap->version = PWC_VERSION_CODE;

	cap->capabilities =

		V4L2_CAP_VIDEO_CAPTURE	|

		V4L2_CAP_STREAMING	|

drivers/media/video/pwc/pwc.h

+1 −6
Original line number Diff line number Diff line
@@ -44,12 +44,7 @@ 
#include <media/pwc-ioctl.h>



/* Version block */

#define PWC_MAJOR	10

#define PWC_MINOR	0

#define PWC_EXTRAMINOR	15



#define PWC_VERSION_CODE KERNEL_VERSION(PWC_MAJOR, PWC_MINOR, PWC_EXTRAMINOR)

#define PWC_VERSION __stringify(PWC_MAJOR) "." __stringify(PWC_MINOR) "." __stringify(PWC_EXTRAMINOR)

#define PWC_VERSION	"10.0.15"

#define PWC_NAME 	"pwc"

#define PFX		PWC_NAME ": "