aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaolo Pantò <munix9@googlemail.com>2012-02-21 10:26:29 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-03-08 09:26:10 -0500
commit9d1760059f29f91ad24cb2dcf75ed2b3f5198dcb (patch)
treef05c052369a959976db330cf7f25989cc77d2400
parent3907b019971fdd626b4740664b6bc7ecdedeec54 (diff)
[media] rtl28xxu: add another Freecom usb id
Besides sticks with the usb id 14AA:0160, there exists also some with 14AA:0161 - this is the output in /var/log/messages: usb 1-1: new high-speed USB device number 2 using ehci_hcd usb 1-1: New USB device found, idVendor=14aa, idProduct=0161 usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3 usb 1-1: Product: Freecom DVB-T usb 1-1: Manufacturer: Freecom DVB-T usb 1-1: SerialNumber: 00000000000036742 The patch is based on the code at http://git.linuxtv.org/anttip/media_tree.git/shortlog/refs/heads/realtek Signed-off-by: Paolo Pantò <munix9@googlemail.com> Acked-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/dvb/dvb-usb/dvb-usb-ids.h1
-rw-r--r--drivers/media/dvb/dvb-usb/rtl28xxu.c4
2 files changed, 5 insertions, 0 deletions
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index bf2826fa591d..397d8f232731 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -128,6 +128,7 @@
128#define USB_PID_E3C_EC168_4 0x1001 128#define USB_PID_E3C_EC168_4 0x1001
129#define USB_PID_E3C_EC168_5 0x1002 129#define USB_PID_E3C_EC168_5 0x1002
130#define USB_PID_FREECOM_DVBT 0x0160 130#define USB_PID_FREECOM_DVBT 0x0160
131#define USB_PID_FREECOM_DVBT_2 0x0161
131#define USB_PID_UNIWILL_STK7700P 0x6003 132#define USB_PID_UNIWILL_STK7700P 0x6003
132#define USB_PID_GENIUS_TVGO_DVB_T03 0x4012 133#define USB_PID_GENIUS_TVGO_DVB_T03 0x4012
133#define USB_PID_GRANDTEC_DVBT_USB_COLD 0x0fa0 134#define USB_PID_GRANDTEC_DVBT_USB_COLD 0x0fa0
diff --git a/drivers/media/dvb/dvb-usb/rtl28xxu.c b/drivers/media/dvb/dvb-usb/rtl28xxu.c
index 07597c53d07b..8f4736a10fc8 100644
--- a/drivers/media/dvb/dvb-usb/rtl28xxu.c
+++ b/drivers/media/dvb/dvb-usb/rtl28xxu.c
@@ -767,6 +767,7 @@ err:
767enum rtl28xxu_usb_table_entry { 767enum rtl28xxu_usb_table_entry {
768 RTL2831U_0BDA_2831, 768 RTL2831U_0BDA_2831,
769 RTL2831U_14AA_0160, 769 RTL2831U_14AA_0160,
770 RTL2831U_14AA_0161,
770}; 771};
771 772
772static struct usb_device_id rtl28xxu_table[] = { 773static struct usb_device_id rtl28xxu_table[] = {
@@ -775,6 +776,8 @@ static struct usb_device_id rtl28xxu_table[] = {
775 USB_DEVICE(USB_VID_REALTEK, USB_PID_REALTEK_RTL2831U)}, 776 USB_DEVICE(USB_VID_REALTEK, USB_PID_REALTEK_RTL2831U)},
776 [RTL2831U_14AA_0160] = { 777 [RTL2831U_14AA_0160] = {
777 USB_DEVICE(USB_VID_WIDEVIEW, USB_PID_FREECOM_DVBT)}, 778 USB_DEVICE(USB_VID_WIDEVIEW, USB_PID_FREECOM_DVBT)},
779 [RTL2831U_14AA_0161] = {
780 USB_DEVICE(USB_VID_WIDEVIEW, USB_PID_FREECOM_DVBT_2)},
778 781
779 /* RTL2832U */ 782 /* RTL2832U */
780 {} /* terminating entry */ 783 {} /* terminating entry */
@@ -840,6 +843,7 @@ static struct dvb_usb_device_properties rtl28xxu_properties[] = {
840 .name = "Freecom USB2.0 DVB-T", 843 .name = "Freecom USB2.0 DVB-T",
841 .warm_ids = { 844 .warm_ids = {
842 &rtl28xxu_table[RTL2831U_14AA_0160], 845 &rtl28xxu_table[RTL2831U_14AA_0160],
846 &rtl28xxu_table[RTL2831U_14AA_0161],
843 }, 847 },
844 }, 848 },
845 } 849 }