From 75d65a3baf47ea657e3c41129cdb458e07274a29 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Tue, 12 Mar 2013 18:03:20 -0300 Subject: [PATCH] --- yaml --- r: 366827 b: refs/heads/master c: 20c5f4925e96719eb83a4f15765a6e653d24bfde h: refs/heads/master i: 366825: 38d3efddf7198dc0935c43f035a84cef834c1faf 366823: cc89d23e089a57cbd835e5b11f513a1a3aa594b1 v: v3 --- [refs] | 2 +- trunk/drivers/staging/media/solo6x10/solo6x10.h | 11 +---------- trunk/drivers/staging/media/solo6x10/v4l2-enc.c | 9 ++++----- trunk/drivers/staging/media/solo6x10/v4l2.c | 9 ++++----- 4 files changed, 10 insertions(+), 21 deletions(-) diff --git a/[refs] b/[refs] index c5799e2fabab..f226c154fe12 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dcae5dacbce518513abf7776cb450b7bd95d722b +refs/heads/master: 20c5f4925e96719eb83a4f15765a6e653d24bfde diff --git a/trunk/drivers/staging/media/solo6x10/solo6x10.h b/trunk/drivers/staging/media/solo6x10/solo6x10.h index a75d9395b7b1..d8d61deb7237 100644 --- a/trunk/drivers/staging/media/solo6x10/solo6x10.h +++ b/trunk/drivers/staging/media/solo6x10/solo6x10.h @@ -71,16 +71,7 @@ #define SOLO_MAX_CHANNELS 16 -/* Make sure these two match */ -#define SOLO6X10_VER_MAJOR 2 -#define SOLO6X10_VER_MINOR 4 -#define SOLO6X10_VER_SUB 4 -#define SOLO6X10_VER_NUM \ - KERNEL_VERSION(SOLO6X10_VER_MAJOR, SOLO6X10_VER_MINOR, SOLO6X10_VER_SUB) -#define SOLO6X10_VERSION \ - __stringify(SOLO6X10_VER_MAJOR) "." \ - __stringify(SOLO6X10_VER_MINOR) "." \ - __stringify(SOLO6X10_VER_SUB) +#define SOLO6X10_VERSION "3.0.0" /* * The SOLO6x10 actually has 8 i2c channels, but we only use 2. diff --git a/trunk/drivers/staging/media/solo6x10/v4l2-enc.c b/trunk/drivers/staging/media/solo6x10/v4l2-enc.c index bb4d60a4c723..bb5f1b82ddcd 100644 --- a/trunk/drivers/staging/media/solo6x10/v4l2-enc.c +++ b/trunk/drivers/staging/media/solo6x10/v4l2-enc.c @@ -991,12 +991,11 @@ static int solo_enc_querycap(struct file *file, void *priv, strcpy(cap->driver, SOLO6X10_NAME); snprintf(cap->card, sizeof(cap->card), "Softlogic 6x10 Enc %d", solo_enc->ch); - snprintf(cap->bus_info, sizeof(cap->bus_info), "PCI %s", + snprintf(cap->bus_info, sizeof(cap->bus_info), "PCI:%s", pci_name(solo_dev->pdev)); - cap->version = SOLO6X10_VER_NUM; - cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | - V4L2_CAP_READWRITE | - V4L2_CAP_STREAMING; + cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | + V4L2_CAP_READWRITE | V4L2_CAP_STREAMING; + cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; return 0; } diff --git a/trunk/drivers/staging/media/solo6x10/v4l2.c b/trunk/drivers/staging/media/solo6x10/v4l2.c index ba603ce1f746..70da9e2187d2 100644 --- a/trunk/drivers/staging/media/solo6x10/v4l2.c +++ b/trunk/drivers/staging/media/solo6x10/v4l2.c @@ -476,12 +476,11 @@ static int solo_querycap(struct file *file, void *priv, strcpy(cap->driver, SOLO6X10_NAME); strcpy(cap->card, "Softlogic 6x10"); - snprintf(cap->bus_info, sizeof(cap->bus_info), "PCI %s", + snprintf(cap->bus_info, sizeof(cap->bus_info), "PCI:%s", pci_name(solo_dev->pdev)); - cap->version = SOLO6X10_VER_NUM; - cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | - V4L2_CAP_READWRITE | - V4L2_CAP_STREAMING; + cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | + V4L2_CAP_READWRITE | V4L2_CAP_STREAMING; + cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; return 0; }