From 9d7ba5bf5c4c8ee3bbbbd5bdddd508132bc84bcb Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 22 Jul 2008 15:51:26 -0700 Subject: [PATCH] another .25 patch and some cleanups --- ...acy-do-not-return-tx_busy-from-op_tx.patch | 1 + ...sdn_common.c-fix-small-resource-leak.patch | 2 +- queue-2.6.25/series | 1 + ...pport-for-terratec-cinergy-t-usb-xxs.patch | 71 +++++++++++++++++++ .../zd1211rw-add-id-for-airties-wus-201.patch | 4 ++ 5 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 queue-2.6.25/v4l-dvb-added-support-for-terratec-cinergy-t-usb-xxs.patch diff --git a/queue-2.6.25/b43legacy-do-not-return-tx_busy-from-op_tx.patch b/queue-2.6.25/b43legacy-do-not-return-tx_busy-from-op_tx.patch index c3ced51cd27..844fe85ec71 100644 --- a/queue-2.6.25/b43legacy-do-not-return-tx_busy-from-op_tx.patch +++ b/queue-2.6.25/b43legacy-do-not-return-tx_busy-from-op_tx.patch @@ -7,6 +7,7 @@ Cc: linux-wireless@vger.kernel.org, John Linville , Stef Message-ID: <200807030106.32960.mb@bu3sch.de> Content-Disposition: inline +From: Michael Buesch Never return TX_BUSY from op_tx. It doesn't make sense to return TX_BUSY, if we can not transmit the packet. diff --git a/queue-2.6.25/drivers-isdn-i4l-isdn_common.c-fix-small-resource-leak.patch b/queue-2.6.25/drivers-isdn-i4l-isdn_common.c-fix-small-resource-leak.patch index bf86a1ceef3..67b142ce88b 100644 --- a/queue-2.6.25/drivers-isdn-i4l-isdn_common.c-fix-small-resource-leak.patch +++ b/queue-2.6.25/drivers-isdn-i4l-isdn_common.c-fix-small-resource-leak.patch @@ -18,7 +18,7 @@ There looks to be a small leak in isdn_writebuf_stub() in isdn_common.c, when copy_from_user() returns an un-copied data length (length != 0). The below patch should be a minimally invasive fix. -Signed-off-by: Darren Jenkins +Signed-off-by: Darren Jenkins Acked-by: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds diff --git a/queue-2.6.25/series b/queue-2.6.25/series index df1fbb7d174..7d017622e88 100644 --- a/queue-2.6.25/series +++ b/queue-2.6.25/series @@ -44,3 +44,4 @@ powerpc-add-missing-reference-to-coherent_dma_mask.patch pxamci-fix-byte-aligned-dma-transfers.patch mmc-don-t-use-dma-on-newer-ene-controllers.patch hrtimer-prevent-migration-for-raising-softirq.patch +v4l-dvb-added-support-for-terratec-cinergy-t-usb-xxs.patch diff --git a/queue-2.6.25/v4l-dvb-added-support-for-terratec-cinergy-t-usb-xxs.patch b/queue-2.6.25/v4l-dvb-added-support-for-terratec-cinergy-t-usb-xxs.patch new file mode 100644 index 00000000000..8c5e3a76e1e --- /dev/null +++ b/queue-2.6.25/v4l-dvb-added-support-for-terratec-cinergy-t-usb-xxs.patch @@ -0,0 +1,71 @@ +From dc88807ed61ed0fc0d57bd80a92508b9de638f5d Mon Sep 17 00:00:00 2001 +From: Alexander Simon +Date: Sat, 29 Mar 2008 21:37:54 -0300 +Subject: [PATCH] V4L/DVB (7475): Added support for Terratec Cinergy T USB XXS + +From: Alexander Simon + +commit dc88807ed61ed0fc0d57bd80a92508b9de638f5d upstream. + + +Alexander Simon found out that the Terratec Cinergy T USB XXS is just a +clone of another DiB7070P-based device. + +Signed-off-by: Patrick Boettcher +Signed-off-by: Mauro Carvalho Chehab +Cc: Ludwig Nussel +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/media/dvb/dvb-usb/dib0700_devices.c | 7 ++++++- + drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 3 ++- + 2 files changed, 8 insertions(+), 2 deletions(-) + +--- a/drivers/media/dvb/dvb-usb/dib0700_devices.c ++++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c +@@ -1062,6 +1062,7 @@ struct usb_device_id dib0700_usb_id_tabl + /* 30 */{ USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV73E) }, + { USB_DEVICE(USB_VID_YUAN, USB_PID_YUAN_EC372S) }, + { USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_HT_EXPRESS) }, ++ { USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_T_XXS) }, + { 0 } /* Terminating entry */ + }; + MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table); +@@ -1251,7 +1252,7 @@ struct dvb_usb_device_properties dib0700 + }, + }, + +- .num_device_descs = 8, ++ .num_device_descs = 9, + .devices = { + { "DiBcom STK7070P reference design", + { &dib0700_usb_id_table[15], NULL }, +@@ -1285,6 +1286,10 @@ struct dvb_usb_device_properties dib0700 + { &dib0700_usb_id_table[30], NULL }, + { NULL }, + }, ++ { "Terratec Cinergy T USB XXS", ++ { &dib0700_usb_id_table[33], NULL }, ++ { NULL }, ++ }, + }, + + .rc_interval = DEFAULT_RC_INTERVAL, +--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h ++++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h +@@ -137,6 +137,7 @@ + #define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY 0x005a + #define USB_PID_TERRATEC_CINERGY_HT_USB_XE 0x0058 + #define USB_PID_TERRATEC_CINERGY_HT_EXPRESS 0x0060 ++#define USB_PID_TERRATEC_CINERGY_T_XXS 0x0078 + #define USB_PID_PINNACLE_EXPRESSCARD_320CX 0x022e + #define USB_PID_PINNACLE_PCTV2000E 0x022c + #define USB_PID_PINNACLE_PCTV_DVB_T_FLASH 0x0228 +@@ -191,6 +192,6 @@ + #define USB_PID_GIGABYTE_U7000 0x7001 + #define USB_PID_ASUS_U3000 0x171f + #define USB_PID_ASUS_U3100 0x173f +-#define USB_PID_YUAN_EC372S 0x1edc ++#define USB_PID_YUAN_EC372S 0x1edc + + #endif diff --git a/queue-2.6.25/zd1211rw-add-id-for-airties-wus-201.patch b/queue-2.6.25/zd1211rw-add-id-for-airties-wus-201.patch index 78d54a69a8a..d6fa127220e 100644 --- a/queue-2.6.25/zd1211rw-add-id-for-airties-wus-201.patch +++ b/queue-2.6.25/zd1211rw-add-id-for-airties-wus-201.patch @@ -3,6 +3,10 @@ From: Firat Birlik Date: Fri, 4 Jul 2008 04:31:50 +0100 Subject: zd1211rw: add ID for AirTies WUS-201 +From: Firat Birlik + +Commit 9dfd55008e3863dcd93219c74bf05b09e5c549e2 upstream + I would like to inform you of our zd1211 based usb wifi adapter (AirTies WUS-201), which works with the zd1211rw driver with the following device id definition. -- 2.47.3