remove saa7164-fix-querycap-warning.patch patch from 3.10 and 3.14

diff --git a/queue-3.10/saa7164-fix-querycap-warning.patch b/queue-3.10/saa7164-fix-querycap-warning.patch
deleted file mode 100644 (file)
index 8584458..0000000
--- a/queue-3.10/saa7164-fix-querycap-warning.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 534bc3e2ee93835badca753bedce8073c67caa92 Mon Sep 17 00:00:00 2001
-From: Hans Verkuil <hverkuil@xs4all.nl>
-Date: Fri, 27 Mar 2015 15:17:56 -0300
-Subject: [media] saa7164: fix querycap warning
-
-From: Hans Verkuil <hverkuil@xs4all.nl>
-
-commit 534bc3e2ee93835badca753bedce8073c67caa92 upstream.
-
-Fix the VIDIOC_QUERYCAP warning due to the missing device_caps. Don't fill
-in the version field, the V4L2 core will do that for you.
-
-Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
-Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/media/pci/saa7164/saa7164-encoder.c |   11 ++++++-----
- drivers/media/pci/saa7164/saa7164-vbi.c     |   11 ++++++-----
- 2 files changed, 12 insertions(+), 10 deletions(-)
-
---- a/drivers/media/pci/saa7164/saa7164-encoder.c
-+++ b/drivers/media/pci/saa7164/saa7164-encoder.c
-@@ -711,13 +711,14 @@ static int vidioc_querycap(struct file *
-               sizeof(cap->card));
-       sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci));
- 
--      cap->capabilities =
-+      cap->device_caps =
-               V4L2_CAP_VIDEO_CAPTURE |
--              V4L2_CAP_READWRITE     |
--              0;
-+              V4L2_CAP_READWRITE |
-+              V4L2_CAP_TUNER;
- 
--      cap->capabilities |= V4L2_CAP_TUNER;
--      cap->version = 0;
-+      cap->capabilities = cap->device_caps |
-+              V4L2_CAP_VBI_CAPTURE |
-+              V4L2_CAP_DEVICE_CAPS;
- 
-       return 0;
- }
---- a/drivers/media/pci/saa7164/saa7164-vbi.c
-+++ b/drivers/media/pci/saa7164/saa7164-vbi.c
-@@ -650,13 +650,14 @@ static int vidioc_querycap(struct file *
-               sizeof(cap->card));
-       sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci));
- 
--      cap->capabilities =
-+      cap->device_caps =
-               V4L2_CAP_VBI_CAPTURE |
--              V4L2_CAP_READWRITE     |
--              0;
-+              V4L2_CAP_READWRITE |
-+              V4L2_CAP_TUNER;
- 
--      cap->capabilities |= V4L2_CAP_TUNER;
--      cap->version = 0;
-+      cap->capabilities = cap->device_caps |
-+              V4L2_CAP_VIDEO_CAPTURE |
-+              V4L2_CAP_DEVICE_CAPS;
- 
-       return 0;
- }

diff --git a/queue-3.10/series b/queue-3.10/series
index a84d1223e9e3cb0dc95d263491c5ff6257821b52..7c30bf6782a4a5633520889a3d19f32dd09322c7 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -31,7 +31,6 @@ jbd2-fix-ocfs2-corrupt-when-updating-journal-superblock-fails.patch
 i2c-at91-fix-a-race-condition-when-using-the-dma-controller.patch
 iio-dac-ad5624r_spi-fix-bit-shift-of-output-data-value.patch
 af9013-don-t-accept-invalid-bandwidth.patch
-saa7164-fix-querycap-warning.patch
 s5h1420-fix-a-buffer-overflow-when-checking-userspace-params.patch
 cx24116-fix-a-buffer-overflow-when-checking-userspace-params.patch
 asoc-wm8737-fixup-setting-vmid-impedance-control-register.patch

diff --git a/queue-3.14/saa7164-fix-querycap-warning.patch b/queue-3.14/saa7164-fix-querycap-warning.patch
deleted file mode 100644 (file)
index 2cf3f70..0000000
--- a/queue-3.14/saa7164-fix-querycap-warning.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 534bc3e2ee93835badca753bedce8073c67caa92 Mon Sep 17 00:00:00 2001
-From: Hans Verkuil <hverkuil@xs4all.nl>
-Date: Fri, 27 Mar 2015 15:17:56 -0300
-Subject: [media] saa7164: fix querycap warning
-
-From: Hans Verkuil <hverkuil@xs4all.nl>
-
-commit 534bc3e2ee93835badca753bedce8073c67caa92 upstream.
-
-Fix the VIDIOC_QUERYCAP warning due to the missing device_caps. Don't fill
-in the version field, the V4L2 core will do that for you.
-
-Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
-Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/media/pci/saa7164/saa7164-encoder.c |   11 ++++++-----
- drivers/media/pci/saa7164/saa7164-vbi.c     |   11 ++++++-----
- 2 files changed, 12 insertions(+), 10 deletions(-)
-
---- a/drivers/media/pci/saa7164/saa7164-encoder.c
-+++ b/drivers/media/pci/saa7164/saa7164-encoder.c
-@@ -721,13 +721,14 @@ static int vidioc_querycap(struct file *
-               sizeof(cap->card));
-       sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci));
- 
--      cap->capabilities =
-+      cap->device_caps =
-               V4L2_CAP_VIDEO_CAPTURE |
--              V4L2_CAP_READWRITE     |
--              0;
-+              V4L2_CAP_READWRITE |
-+              V4L2_CAP_TUNER;
- 
--      cap->capabilities |= V4L2_CAP_TUNER;
--      cap->version = 0;
-+      cap->capabilities = cap->device_caps |
-+              V4L2_CAP_VBI_CAPTURE |
-+              V4L2_CAP_DEVICE_CAPS;
- 
-       return 0;
- }
---- a/drivers/media/pci/saa7164/saa7164-vbi.c
-+++ b/drivers/media/pci/saa7164/saa7164-vbi.c
-@@ -660,13 +660,14 @@ static int vidioc_querycap(struct file *
-               sizeof(cap->card));
-       sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci));
- 
--      cap->capabilities =
-+      cap->device_caps =
-               V4L2_CAP_VBI_CAPTURE |
--              V4L2_CAP_READWRITE     |
--              0;
-+              V4L2_CAP_READWRITE |
-+              V4L2_CAP_TUNER;
- 
--      cap->capabilities |= V4L2_CAP_TUNER;
--      cap->version = 0;
-+      cap->capabilities = cap->device_caps |
-+              V4L2_CAP_VIDEO_CAPTURE |
-+              V4L2_CAP_DEVICE_CAPS;
- 
-       return 0;
- }

diff --git a/queue-3.14/series b/queue-3.14/series
index d07fa22e420635ba928ff38c5c323173958aee76..8f9c66dfeb303d4c8dce2c65ae081367fe544f8d 100644 (file)
--- a/queue-3.14/series
+++ b/queue-3.14/series
@@ -45,7 +45,6 @@ iio-tmp006-check-channel-info-on-write.patch
 iio-adc-at91_adc-allow-to-use-full-range-of-startup-time.patch
 cx24117-fix-a-buffer-overflow-when-checking-userspace-params.patch
 af9013-don-t-accept-invalid-bandwidth.patch
-saa7164-fix-querycap-warning.patch
 s5h1420-fix-a-buffer-overflow-when-checking-userspace-params.patch
 cx24116-fix-a-buffer-overflow-when-checking-userspace-params.patch
 asoc-arizona-fix-noise-generator-gain-tlv.patch