rpms/kernel/F-11 v4l-dvb-fix-cx25840-firmware-load.patch, NONE, 1.1.2.1 kernel.spec, 1.1679.2.19, 1.1679.2.20

[Jarod Wilson]

Author: jwilson

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

Modified Files:
      Tag: private-fedora-11-2_6_29_6
	kernel.spec 
Added Files:
      Tag: private-fedora-11-2_6_29_6
	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 ---

# HG changeset patch
# User Steven Toth <stoth at kernellabs.com>
# Date 1251746101 14400
# Node ID 38c5fb14c770c256d1a497ff6da3e33849f6b8cf
# Parent 7c23abfe445f8b57d57db98a97a0786ab801d63e
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>

--- a/drivers/media/video/cx25840/cx25840-firmware.c	Mon Aug 31 02:03:28 2009 -0300
+++ b/drivers/media/video/cx25840/cx25840-firmware.c	Mon Aug 31 15:15:01 2009 -0400
@@ -109,6 +109,8 @@
 	}
 	else if (state->is_cx231xx)
 		firmware = FWFILE_CX231XX;
+	else
+		firmware = FWFILE;
 
 	if ((state->is_cx231xx) && MAX_BUF_SIZE > 16) {
 		v4l_err(client, " Firmware download size changed to 16 bytes max length\n");



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1679.2.19
retrieving revision 1.1679.2.20
diff -u -p -r1.1679.2.19 -r1.1679.2.20
--- kernel.spec	28 Aug 2009 16:57:11 -0000	1.1679.2.19
+++ kernel.spec	31 Aug 2009 19:31:16 -0000	1.1679.2.20
@@ -766,6 +766,7 @@ Patch2900: linux-2.6-v4l-dvb-fixes.patch
 Patch2901: linux-2.6-v4l-dvb-experimental.patch
 Patch2902: linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch
 Patch2903: linux-2.6-revert-dvb-net-kabi-change.patch
+Patch2094: v4l-dvb-fix-cx25840-firmware-load.patch
 
 # fs fixes
 # ext4 fixes
@@ -1523,6 +1524,7 @@ ApplyPatch linux-2.6-v4l-dvb-fixes.patch
 ApplyPatch linux-2.6-v4l-dvb-experimental.patch
 ApplyPatch linux-2.6-v4l-dvb-fix-uint16_t-audio-h.patch
 ApplyPatch linux-2.6-revert-dvb-net-kabi-change.patch
+ApplyPatch v4l-dvb-fix-cx25840-firmware-load.patch
 ApplyPatch hdpvr-ir-enable.patch
 
 # revert 8b249b6856f16f09b0e5b79ce5f4d435e439b9d6
@@ -2184,6 +2186,9 @@ fi
 # and build.
 
 %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)
+
 * Fri Aug 28 2009 David Woodhouse <David.Woodhouse at intel.com>
 - Enable Solos DSL driver