rpms/kernel/F-10 v4l-dvb-fix-cx25840-firmware-load.patch, NONE, 1.1.2.1 kernel.spec, 1.1206.2.84, 1.1206.2.85

[Jarod Wilson]

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18699

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec 
Added Files:
      Tag: private-fedora-10-2_6_27
	v4l-dvb-fix-cx25840-firmware-load.patch 
Log Message:
* Mon Aug 31 2009 Jarod Wilson <jarod at redhat.com>
- Fix audio on PVR-500 when used in same system as HVR-1800 (#480728)


v4l-dvb-fix-cx25840-firmware-load.patch:
 cx25840-firmware.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE v4l-dvb-fix-cx25840-firmware-load.patch ---
CX25840: Bugfix CX23885 and CX241xx caused ivtv regression.

From: Steven Toth <stoth at kernellabs.com>

If we override a global we need to ensure the else case resets it correctly,
or we end up loading an incorrect firmware.

Priority: normal

Signed-off-by: Steven Toth <stoth at kernellabs.com>

Trivial backport to 2.6.27

Signed-off-by: Jarod Wilson <jarod at redhat.com>

--- linux/drivers/media/video/cx25840/cx25840-firmware.c.orig	2009-08-31 15:19:21.000000000 -0400
+++ linux/drivers/media/video/cx25840/cx25840-firmware.c	2009-08-31 15:19:37.000000000 -0400
@@ -99,6 +99,8 @@ int cx25840_loadfw(struct i2c_client *cl
 
 	if (state->is_cx23885)
 		firmware = FWFILE_CX23885;
+	else
+		firmware = FWFILE;
 
 	if (request_firmware(&fw, firmware, FWDEV(client)) != 0) {
 		v4l_err(client, "unable to open firmware %s\n", firmware);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.84
retrieving revision 1.1206.2.85
diff -u -p -r1.1206.2.84 -r1.1206.2.85
--- kernel.spec	19 Aug 2009 14:22:02 -0000	1.1206.2.84
+++ kernel.spec	31 Aug 2009 19:24:37 -0000	1.1206.2.85
@@ -777,6 +777,8 @@ Patch3130: disable-p4-cpufreq-ui.patch
 
 # Fix up the v4l2 video_open function
 Patch3140: linux-2.6.27-fix-video_open.patch
+# Fix simultaneous use of hvr-1800 and pvr-500 (#480728)
+Patch3141: v4l-dvb-fix-cx25840-firmware-load.patch
 
 Patch4000: kvm-vmx-don-t-allow-uninhibited-access-to-efer-on-i386.patch
 Patch4010: kvm-make-efer-reads-safe-when-efer-does-not-exist.patch
@@ -1414,6 +1416,7 @@ ApplyPatch linux-2.6-selinux-empty-tty-f
 ApplyPatch disable-p4-cpufreq-ui.patch
 
 ApplyPatch linux-2.6.27-fix-video_open.patch
+ApplyPatch v4l-dvb-fix-cx25840-firmware-load.patch
 
 ApplyPatch kvm-vmx-don-t-allow-uninhibited-access-to-efer-on-i386.patch
 ApplyPatch kvm-make-efer-reads-safe-when-efer-does-not-exist.patch
@@ -2005,6 +2008,9 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Aug 31 2009 Jarod Wilson <jarod at redhat.com>
+- Fix audio on PVR-500 when used in same system as HVR-1800 (#480728)
+
 * Tue Aug 18 2009 Kyle McMartin <kyle at redhat.com>
 - Backport several upstream commits 52dec22e739eec8f3a0154f768a599f5489048bd
   to improve mmap_min_addr.