rpms/kernel/FC-6 linux-2.6-revert-cx88-freezer.patch, NONE, 1.1.2.1 kernel-2.6.spec, 1.2911.6.1, 1.2911.6.2

[fedora-cvs-commits at redhat.com]

Author: cebbert

Update of /cvs/dist/rpms/kernel/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv7067

Modified Files:
      Tag: kernel-2_6_19-1_2911_fc6_stable
	kernel-2.6.spec 
Added Files:
      Tag: kernel-2_6_19-1_2911_fc6_stable
	linux-2.6-revert-cx88-freezer.patch 
Log Message:
revert broken part of -rc1 patch


linux-2.6-revert-cx88-freezer.patch:
 cx88-tvaudio.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE linux-2.6-revert-cx88-freezer.patch ---
diff --git a/drivers/media/video/cx88/cx88-tvaudio.c b/drivers/media/video/cx88/cx88-tvaudio.c
index 58ba9f7..04549a3 100644
--- a/drivers/media/video/cx88/cx88-tvaudio.c
+++ b/drivers/media/video/cx88/cx88-tvaudio.c
@@ -38,6 +38,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/errno.h>
+#include <linux/freezer.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
@@ -974,6 +975,7 @@ int cx88_audio_thread(void *data)
 		msleep_interruptible(1000);
 		if (kthread_should_stop())
 			break;
+		try_to_freeze();
 
 		/* just monitor the audio status for now ... */
 		memset(&t, 0, sizeof(t));


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v
retrieving revision 1.2911.6.1
retrieving revision 1.2911.6.2
diff -u -r1.2911.6.1 -r1.2911.6.2
--- kernel-2.6.spec	22 Feb 2007 00:01:18 -0000	1.2911.6.1
+++ kernel-2.6.spec	22 Feb 2007 01:05:28 -0000	1.2911.6.2
@@ -313,6 +313,9 @@
 Patch2: patch-2.6.19.3-4.bz2
 Patch3: patch-2.6.19.5-rc1.bz2
 
+# reverse part of the -rc1 patch -- it's broken
+Patch4: linux-2.6-revert-cx88-freezer.patch
+
 # Patches 10 through 99 are for things that are going upstream really soon.
 Patch10: linux-2.6-utrace.patch
 Patch11: linux-2.6-utrace-fixup.patch
@@ -820,6 +823,8 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+# revert broken part of -rc1 patch
+%patch4 -p1 -R
 
 # Patches 10 through 100 are meant for core subsystem upgrades