From: Greg Kroah-Hartman Date: Sat, 18 Oct 2008 17:23:03 +0000 (-0700) Subject: .27 patches X-Git-Tag: v2.6.27.2~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=285d6fb2b18bd7cb457bdbc1efacb58641b76995;p=thirdparty%2Fkernel%2Fstable-queue.git .27 patches --- diff --git a/queue-2.6.27/dvb-au0828-add-support-for-another-usb-id-for-hauppauge-hvr950q.patch b/queue-2.6.27/dvb-au0828-add-support-for-another-usb-id-for-hauppauge-hvr950q.patch new file mode 100644 index 00000000000..cc59a950c3c --- /dev/null +++ b/queue-2.6.27/dvb-au0828-add-support-for-another-usb-id-for-hauppauge-hvr950q.patch @@ -0,0 +1,52 @@ +From mkrufky@linuxtv.org Sat Oct 18 10:19:23 2008 +From: Michael Krufky +Date: Sat, 18 Oct 2008 10:36:01 -0400 +Subject: DVB: au0828: add support for another USB id for Hauppauge HVR950Q +To: stable@kernel.org +Message-ID: <48F9F451.3020709@linuxtv.org> + +From: Michael Krufky + +(cherry picked from commit a636da6bab3307fc8c6e6a22a63b0b25ba0687be) + +DVB: au0828: add support for another USB id for Hauppauge HVR950Q + +Add autodetection support for a new revision of the Hauppauge HVR950Q (2040:721e) + +Signed-off-by: Michael Krufky +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Greg Kroah-Hartman + +--- + Documentation/video4linux/CARDLIST.au0828 | 2 +- + drivers/media/video/au0828/au0828-cards.c | 3 +++ + 2 files changed, 4 insertions(+), 1 deletion(-) + +--- a/Documentation/video4linux/CARDLIST.au0828 ++++ b/Documentation/video4linux/CARDLIST.au0828 +@@ -1,5 +1,5 @@ + 0 -> Unknown board (au0828) +- 1 -> Hauppauge HVR950Q (au0828) [2040:7200,2040:7210,2040:7217,2040:721b,2040:721f,2040:7280,0fd9:0008] ++ 1 -> Hauppauge HVR950Q (au0828) [2040:7200,2040:7210,2040:7217,2040:721b,2040:721e,2040:721f,2040:7280,0fd9:0008] + 2 -> Hauppauge HVR850 (au0828) [2040:7240] + 3 -> DViCO FusionHDTV USB (au0828) [0fe9:d620] + 4 -> Hauppauge HVR950Q rev xxF8 (au0828) [2040:7201,2040:7211,2040:7281] +--- a/drivers/media/video/au0828/au0828-cards.c ++++ b/drivers/media/video/au0828/au0828-cards.c +@@ -90,6 +90,7 @@ static void hauppauge_eeprom(struct au08 + case 72221: /* WinTV-HVR950q (OEM, IR, ATSC/QAM and basic analog video */ + case 72231: /* WinTV-HVR950q (OEM, IR, ATSC/QAM and basic analog video */ + case 72241: /* WinTV-HVR950q (OEM, No IR, ATSC/QAM and basic analog video */ ++ case 72251: /* WinTV-HVR950q (Retail, IR, ATSC/QAM and basic analog video */ + case 72301: /* WinTV-HVR850 (Retail, IR, ATSC and basic analog video */ + case 72500: /* WinTV-HVR950q (OEM, No IR, ATSC/QAM */ + break; +@@ -198,6 +199,8 @@ struct usb_device_id au0828_usb_id_table + .driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q }, + { USB_DEVICE(0x2040, 0x721b), + .driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q }, ++ { USB_DEVICE(0x2040, 0x721e), ++ .driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q }, + { USB_DEVICE(0x2040, 0x721f), + .driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q }, + { USB_DEVICE(0x2040, 0x7280), diff --git a/queue-2.6.27/dvb-sms1xxx-support-two-new-revisions-of-the-hauppauge-wintv-ministick.patch b/queue-2.6.27/dvb-sms1xxx-support-two-new-revisions-of-the-hauppauge-wintv-ministick.patch new file mode 100644 index 00000000000..c523b0cc7d2 --- /dev/null +++ b/queue-2.6.27/dvb-sms1xxx-support-two-new-revisions-of-the-hauppauge-wintv-ministick.patch @@ -0,0 +1,37 @@ +From mkrufky@linuxtv.org Sat Oct 18 10:19:46 2008 +From: Michael Krufky +Date: Sat, 18 Oct 2008 10:36:06 -0400 +Subject: DVB: sms1xxx: support two new revisions of the Hauppauge WinTV MiniStick +To: stable@kernel.org +Message-ID: <48F9F456.1010405@linuxtv.org> + + +From: Michael Krufky + +(cherry picked from commit 3dfbe31f09fb1da5f17437fd384cdfb6114765d9) + +DVB: sms1xxx: support two new revisions of the Hauppauge WinTV MiniStick + +Autodetect 2040:5520 and 2040:5530 as Hauppauge WinTV MiniStick + +Signed-off-by: Michael Krufky +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/media/dvb/siano/sms-cards.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/drivers/media/dvb/siano/sms-cards.c ++++ b/drivers/media/dvb/siano/sms-cards.c +@@ -42,6 +42,10 @@ struct usb_device_id smsusb_id_table[] = + .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM }, + { USB_DEVICE(0x2040, 0x5510), + .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM }, ++ { USB_DEVICE(0x2040, 0x5520), ++ .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM }, ++ { USB_DEVICE(0x2040, 0x5530), ++ .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM }, + { USB_DEVICE(0x2040, 0x5580), + .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM }, + { USB_DEVICE(0x2040, 0x5590), diff --git a/queue-2.6.27/series b/queue-2.6.27/series index 039e25025c1..b65aeeb1b07 100644 --- a/queue-2.6.27/series +++ b/queue-2.6.27/series @@ -13,3 +13,5 @@ usb-ehci-log-a-warning-if-ehci-hcd-is-not-loaded-first.patch usb-gadget-cdc-ethernet-notification-bugfix.patch usb-musb_hdrc-build-fixes.patch drm-i915-fix-ioremap-of-a-user-address-for-non-root.patch +dvb-au0828-add-support-for-another-usb-id-for-hauppauge-hvr950q.patch +dvb-sms1xxx-support-two-new-revisions-of-the-hauppauge-wintv-ministick.patch