summaryrefslogtreecommitdiffstats
path: root/media-Revert-media-ivtv-avoid-going-past-input-audio.patch
diff options
context:
space:
mode:
Diffstat (limited to 'media-Revert-media-ivtv-avoid-going-past-input-audio.patch')
-rw-r--r--media-Revert-media-ivtv-avoid-going-past-input-audio.patch38
1 files changed, 0 insertions, 38 deletions
diff --git a/media-Revert-media-ivtv-avoid-going-past-input-audio.patch b/media-Revert-media-ivtv-avoid-going-past-input-audio.patch
deleted file mode 100644
index 7c00071c6..000000000
--- a/media-Revert-media-ivtv-avoid-going-past-input-audio.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 823873481b2a17ce5900899f8ef85118f8407b67 Mon Sep 17 00:00:00 2001
-From: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-Date: Wed, 11 Nov 2015 09:22:36 -0200
-Subject: [PATCH] [media] Revert "[media] ivtv: avoid going past input/audio
- array"
-
-This patch broke ivtv logic, as reported at
- https://bugzilla.redhat.com/show_bug.cgi?id=1278942
-
-This reverts commit 09290cc885937cab3b2d60a6d48fe3d2d3e04061.
-
-Cc: stable@vger.kernel.org # for v4.1 and upper
-Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
----
- drivers/media/pci/ivtv/ivtv-driver.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c
-index 8616fa8193bc..c2e60b4f292d 100644
---- a/drivers/media/pci/ivtv/ivtv-driver.c
-+++ b/drivers/media/pci/ivtv/ivtv-driver.c
-@@ -805,11 +805,11 @@ static void ivtv_init_struct2(struct ivtv *itv)
- {
- int i;
-
-- for (i = 0; i < IVTV_CARD_MAX_VIDEO_INPUTS - 1; i++)
-+ for (i = 0; i < IVTV_CARD_MAX_VIDEO_INPUTS; i++)
- if (itv->card->video_inputs[i].video_type == 0)
- break;
- itv->nof_inputs = i;
-- for (i = 0; i < IVTV_CARD_MAX_AUDIO_INPUTS - 1; i++)
-+ for (i = 0; i < IVTV_CARD_MAX_AUDIO_INPUTS; i++)
- if (itv->card->audio_inputs[i].audio_type == 0)
- break;
- itv->nof_audio_inputs = i;
---
-2.5.0
-