3.10.7-100.fc18.gnu

5 files changed, 52 insertions, 9 deletions

diff --git a/freed-ora/current/f18/kernel.spec b/freed-ora/current/f18/kernel.spec
index 9c5e6d7e3..d419f866b 100644
--- a/freed-ora/current/f18/kernel.spec
+++ b/freed-ora/current/f18/kernel.spec
@@ -112,7 +112,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 6
+%define stable_update 7
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -838,6 +838,9 @@ Patch25074: mac80211-fix-infinite-loop-in-ieee80211_determine_chantype.patch
 Patch25075: mac80211-ignore-HT-primary-channel-while-connected.patch
 Patch25076: mac80211-continue-using-disabled-channels-while-connected.patch
 
+#rhbz 963715
+Patch25077: media-cx23885-Fix-TeVii-S471-regression-since-introduction-of-ts2020.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1611,6 +1614,9 @@ ApplyPatch mac80211-fix-infinite-loop-in-ieee80211_determine_chantype.patch
 ApplyPatch mac80211-ignore-HT-primary-channel-while-connected.patch
 ApplyPatch mac80211-continue-using-disabled-channels-while-connected.patch
 
+#rhbz 963715
+ApplyPatch media-cx23885-Fix-TeVii-S471-regression-since-introduction-of-ts2020.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2463,6 +2469,13 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Thu Aug 15 2013 Alexandre Oliva <lxoliva@fsfla.org> -libre
+- GNU Linux-libre 3.10.7-gnu.
+
+* Thu Aug 15 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.7-100
+- Add patch to fix regression on TeVII S471 devices (rhbz 963715)
+- Linux v3.10.7
+
 * Mon Aug 12 2013 Alexandre Oliva <lxoliva@fsfla.org> -libre
 - GNU Linux-libre 3.10.6-gnu.
 
diff --git a/freed-ora/current/f18/media-cx23885-Fix-TeVii-S471-regression-since-introduction-of-ts2020.patch b/freed-ora/current/f18/media-cx23885-Fix-TeVii-S471-regression-since-introduction-of-ts2020.patch
new file mode 100644
index 000000000..2a28a2fe1
--- /dev/null
+++ b/freed-ora/current/f18/media-cx23885-Fix-TeVii-S471-regression-since-introduction-of-ts2020.patch
@@ -0,0 +1,30 @@
+From b43ea8068d2090cb1e44632c8a938ab40d2c7419 Mon Sep 17 00:00:00 2001
+From: Johannes Koch <johannes@ortsraum.de>
+Date: Wed, 17 Jul 2013 17:28:16 +0000
+Subject: [media] cx23885: Fix TeVii S471 regression since introduction of ts2020
+
+Patch to make TeVii S471 cards use the ts2020 tuner, since ds3000 driver no
+longer contains tuning code.
+
+Signed-off-by: Johannes Koch <johannes@ortsraum.de>
+Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
+---
+(limited to 'drivers/media/pci/cx23885/cx23885-dvb.c')
+
+diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c
+index 9c5ed10..bb291c6 100644
+--- a/drivers/media/pci/cx23885/cx23885-dvb.c
++++ b/drivers/media/pci/cx23885/cx23885-dvb.c
+@@ -1249,6 +1249,10 @@ static int dvb_register(struct cx23885_tsport *port)
+ 		fe0->dvb.frontend = dvb_attach(ds3000_attach,
+ 					&tevii_ds3000_config,
+ 					&i2c_bus->i2c_adap);
++		if (fe0->dvb.frontend != NULL) {
++			dvb_attach(ts2020_attach, fe0->dvb.frontend,
++				&tevii_ts2020_config, &i2c_bus->i2c_adap);
++		}
+ 		break;
+ 	case CX23885_BOARD_PROF_8000:
+ 		i2c_bus = &dev->i2c_bus[0];
+--
+cgit v0.9.2
diff --git a/freed-ora/current/f18/patch-3.10-gnu-3.10.6-gnu.xz.sign b/freed-ora/current/f18/patch-3.10-gnu-3.10.6-gnu.xz.sign
deleted file mode 100644
index e6f40ddc8..000000000
--- a/freed-ora/current/f18/patch-3.10-gnu-3.10.6-gnu.xz.sign
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEABECAAYFAlIIxY0ACgkQvLfPh359R6fCqACfQeqJ9K0FTi1t1q6lMqZAVkqS
-dOEAnjRVHm8z9YBL71Z7RPiq8JrKxajS
-=9FY3
------END PGP SIGNATURE-----
diff --git a/freed-ora/current/f18/patch-3.10-gnu-3.10.7-gnu.xz.sign b/freed-ora/current/f18/patch-3.10-gnu-3.10.7-gnu.xz.sign
new file mode 100644
index 000000000..7ec555505
--- /dev/null
+++ b/freed-ora/current/f18/patch-3.10-gnu-3.10.7-gnu.xz.sign
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEABECAAYFAlINNCkACgkQvLfPh359R6d+VgCfZ5IDuYgwvFxl3DmCGGAAZ2GN
+rgcAn19RHhD8yY5I1PsmE0bjt+CGC14Y
+=bYR9
+-----END PGP SIGNATURE-----
diff --git a/freed-ora/current/f18/sources b/freed-ora/current/f18/sources
index 28f4fac74..3232d9c50 100644
--- a/freed-ora/current/f18/sources
+++ b/freed-ora/current/f18/sources
@@ -1,2 +1,2 @@
 d562fd52580a3b6b18b6eeb5921d1d5c  linux-libre-3.10-gnu.tar.xz
-63a1c2aba22871f8e8dacdb4968d9a1f  patch-3.10-gnu-3.10.6-gnu.xz
+8d05dec5772b17c4c21c00b93da42bd8  patch-3.10-gnu-3.10.7-gnu.xz