rpms/kernel/F-9 linux-2.6-dvb-dw2102-support-terratec-cinergy-s.patch, NONE, 1.1.2.1 kernel.spec, 1.891.2.23, 1.891.2.24

[Chuck Ebbert]

Author: cebbert

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

Modified Files:
      Tag: private-fedora-9-2_6_27-branch
	kernel.spec 
Added Files:
      Tag: private-fedora-9-2_6_27-branch
	linux-2.6-dvb-dw2102-support-terratec-cinergy-s.patch 
Log Message:
Support Terratec Cinergy DVB USB device (#486240)

linux-2.6-dvb-dw2102-support-terratec-cinergy-s.patch:

--- NEW FILE linux-2.6-dvb-dw2102-support-terratec-cinergy-s.patch ---
From: Igor M. Liplianin <liplianin at me.by>
Date: Thu, 6 Nov 2008 01:12:56 +0000 (-0300)
Subject: V4L/DVB (9537): Add TerraTec Cinergy S USB support
X-Git-Tag: v2.6.29-rc1~556^2~440
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=4cc0edff341294d14f3a6acb3ddb97abdf29b8c0

V4L/DVB (9537): Add TerraTec Cinergy S USB support

Add TerraTec Cinergy S USB support

Signed-off-by: Igor M. Liplianin <liplianin at me.by>
Acked-by: Thorsten Leupold <th86 at gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
---

diff --git a/drivers/media/dvb/dvb-usb/dw2102.c b/drivers/media/dvb/dvb-usb/dw2102.c
index c943171..bc5e47a 100644
--- a/drivers/media/dvb/dvb-usb/dw2102.c
+++ b/drivers/media/dvb/dvb-usb/dw2102.c
@@ -26,6 +26,10 @@
 #define USB_PID_DW2104 0x2104
 #endif
 
+#ifndef USB_PID_CINERGY_S
+#define USB_PID_CINERGY_S 0x0064
+#endif
+
 #define DW210X_READ_MSG 0
 #define DW210X_WRITE_MSG 1
 
@@ -577,6 +581,7 @@ static struct usb_device_id dw2102_table[] = {
 	{USB_DEVICE(USB_VID_CYPRESS, 0x2101)},
 	{USB_DEVICE(USB_VID_CYPRESS, 0x2104)},
 	{USB_DEVICE(0x9022, 0xd650)},
+	{USB_DEVICE(USB_VID_TERRATEC, USB_PID_CINERGY_S)},
 	{ }
 };
 
@@ -646,6 +651,7 @@ static int dw2102_load_firmware(struct usb_device *dev,
 			dw210x_op_rw(dev, 0xbf, 0x0040, 0, &reset, 0,
 					DW210X_WRITE_MSG);
 			break;
+		case USB_PID_CINERGY_S:
 		case USB_PID_DW2102:
 			dw210x_op_rw(dev, 0xbf, 0x0040, 0, &reset, 0,
 					DW210X_WRITE_MSG);
@@ -725,7 +731,7 @@ static struct dvb_usb_device_properties dw2102_properties = {
 			},
 		}
 	},
-	.num_device_descs = 2,
+	.num_device_descs = 3,
 	.devices = {
 		{"DVBWorld DVB-S 2102 USB2.0",
 			{&dw2102_table[0], NULL},
@@ -735,6 +741,10 @@ static struct dvb_usb_device_properties dw2102_properties = {
 			{&dw2102_table[1], NULL},
 			{NULL},
 		},
+		{"TerraTec Cinergy S USB",
+			{&dw2102_table[4], NULL},
+			{NULL},
+		},
 	}
 };
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.891.2.23
retrieving revision 1.891.2.24
diff -u -r1.891.2.23 -r1.891.2.24
--- kernel.spec	11 Feb 2009 18:22:43 -0000	1.891.2.23
+++ kernel.spec	20 Feb 2009 06:47:36 -0000	1.891.2.24
@@ -694,6 +694,7 @@
 Patch1400: linux-2.6-smarter-relatime.patch
 Patch1515: linux-2.6.27-lirc.patch
 Patch1520: linux-2.6-hdpvr.patch
+Patch1526: linux-2.6-dvb-dw2102-support-terratec-cinergy-s.patch
 
 # Fix the return code CD accesses when the CDROM drive door is closed
 # but the drive isn't yet ready.
@@ -1295,6 +1296,9 @@
 ApplyPatch linux-2.6.27-lirc.patch
 ApplyPatch linux-2.6-hdpvr.patch
 
+# BZ 486240
+ApplyPatch linux-2.6-dvb-dw2102-support-terratec-cinergy-s.patch
+
 # Fix the return code CD accesses when the CDROM drive door is closed
 # but the drive isn't yet ready.
 ApplyPatch linux-2.6-cdrom-door-status.patch
@@ -1940,6 +1944,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Fri Feb 20 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.15-78.2.24
+- Support Terratec Cinergy DVB USB device (#486240)
+
 * Wed Feb 11 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.15-78.2.23
 - Fix more ext4 patch queue problems.
   (http://marc.info/?l=linux-kernel&m=123433917809157&w=2)