[kernel/f17] Fix DVB-S zig-zag logic

[mchehab]

commit 5963c7872d2bee76ac20ba1ccd2ffbbfe9eb5f8b
Author: Mauro Carvalho Chehab <mchehab at redhat.com>
Date:   Mon May 7 14:50:48 2012 -0300

    Fix DVB-S zig-zag logic
    
    This logic got broken by the dvb_frontend.c rewrite.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>

 dvbs-fix-zigzag.patch |   15 +++++++++++++++
 kernel.spec           |    7 ++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/dvbs-fix-zigzag.patch b/dvbs-fix-zigzag.patch
new file mode 100644
index 0000000..4bc9daa
--- /dev/null
+++ b/dvbs-fix-zigzag.patch
@@ -0,0 +1,15 @@
+diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
+index 39696c6..de7dc29 100644
+--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
++++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
+@@ -1898,6 +1898,10 @@ static int dtv_set_frontend(struct dvb_frontend *fe)
+ 	} else {
+ 		/* default values */
+ 		switch (c->delivery_system) {
++		case SYS_DVBS:
++		case SYS_DVBS2:
++		case SYS_ISDBS:
++		case SYS_TURBO:
+ 		case SYS_DVBC_ANNEX_A:
+ 		case SYS_DVBC_ANNEX_C:
+ 			fepriv->min_delay = HZ / 20;
diff --git a/kernel.spec b/kernel.spec
index 7d5b393..f7153c8 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 1
+%global baserelease 2
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -698,6 +698,7 @@ Patch2802: linux-2.6-silence-acpi-blacklist.patch
 # media patches
 Patch2900: add-poll-requested-events.patch
 Patch2901: drivers-media-update.patch
+Patch2902: dvbs-fix-zigzag.patch
 
 # fs fixes
 Patch4000: ext4-fix-resize-when-resizing-within-single-group.patch
@@ -1478,6 +1479,7 @@ ApplyPatch quite-apm.patch
 # Media (V4L/DVB/IR) updates/fixes/experimental drivers
 #  apply if non-empty
 ApplyPatch add-poll-requested-events.patch
+ApplyPatch dvbs-fix-zigzag.patch
 ApplyOptionalPatch drivers-media-update.patch
 
 # Patches headed upstream
@@ -2419,6 +2421,9 @@ fi
 #    '-'      |  |
 #              '-'
 %changelog
+* Mon May 07 2012 Mauro Carvalho Chehab <mchehab at redhat.com> 3.3.5-2
+- Add patch to fix DVB-S zigzag (rhbz 814404)
+
 * Mon May 07 2012 Josh Boyer <jwboyer at redat.com> 3.3.5-1
 - Linux 3.3.5
 - Add patch to rate limit NFSv4 message (rhbz 732748)