From 389a479789b86b10783f6e161e49dd957ab5ed31 Mon Sep 17 00:00:00 2001 From: Jose Alberto Reguero Date: Thu, 26 Jan 2012 20:02:52 -0300 Subject: [PATCH] --- yaml --- r: 294888 b: refs/heads/master c: 260a8f7b06c9f8fba20bea7cd76281a533241076 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/dvb-usb/az6007.c | 3 ++- trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c0d648599d54..e9f55a6451aa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 23268ae5f0447316101ff320ac89d5ee8a0b5f70 +refs/heads/master: 260a8f7b06c9f8fba20bea7cd76281a533241076 diff --git a/trunk/drivers/media/dvb/dvb-usb/az6007.c b/trunk/drivers/media/dvb/dvb-usb/az6007.c index 02efd94dc72b..df4cbc0ed932 100644 --- a/trunk/drivers/media/dvb/dvb-usb/az6007.c +++ b/trunk/drivers/media/dvb/dvb-usb/az6007.c @@ -481,6 +481,7 @@ static int az6007_usb_probe(struct usb_interface *intf, static struct usb_device_id az6007_usb_table[] = { {USB_DEVICE(USB_VID_AZUREWAVE, USB_PID_AZUREWAVE_6007)}, {USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_H7)}, + {USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_H7_2)}, {0}, }; @@ -534,7 +535,7 @@ static struct dvb_usb_device_properties az6007_properties = { .warm_ids = { NULL }, }, { .name = "TerraTec DTV StarBox DVB-T/C USB2.0 (az6007)", - .cold_ids = { &az6007_usb_table[1], NULL }, + .cold_ids = { &az6007_usb_table[1], &az6007_usb_table[2], NULL }, .warm_ids = { NULL }, }, { NULL }, diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h index b3e7be4718a6..9c3dae100160 100644 --- a/trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h +++ b/trunk/drivers/media/dvb/dvb-usb/dvb-usb-ids.h @@ -228,6 +228,7 @@ #define USB_PID_TERRATEC_CINERGY_T_XXS 0x0078 #define USB_PID_TERRATEC_CINERGY_T_XXS_2 0x00ab #define USB_PID_TERRATEC_H7 0x10b4 +#define USB_PID_TERRATEC_H7_2 0x10a3 #define USB_PID_TERRATEC_T3 0x10a0 #define USB_PID_TERRATEC_T5 0x10a1 #define USB_PID_PINNACLE_EXPRESSCARD_320CX 0x022e