diff options
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r-- | drivers/media/dvb/dvb-usb/dib0700_devices.c | 2 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 1 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/ttusb2.c | 7 |
3 files changed, 8 insertions, 2 deletions
diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c index 2208757d9017..aa290bee6a51 100644 --- a/drivers/media/dvb/dvb-usb/dib0700_devices.c +++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c | |||
@@ -287,7 +287,7 @@ MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table); | |||
287 | #define DIB0700_DEFAULT_DEVICE_PROPERTIES \ | 287 | #define DIB0700_DEFAULT_DEVICE_PROPERTIES \ |
288 | .caps = DVB_USB_IS_AN_I2C_ADAPTER, \ | 288 | .caps = DVB_USB_IS_AN_I2C_ADAPTER, \ |
289 | .usb_ctrl = DEVICE_SPECIFIC, \ | 289 | .usb_ctrl = DEVICE_SPECIFIC, \ |
290 | .firmware = "dvb-usb-dib0700-01.fw", \ | 290 | .firmware = "dvb-usb-dib0700-02-rc1.fw", \ |
291 | .download_firmware = dib0700_download_firmware, \ | 291 | .download_firmware = dib0700_download_firmware, \ |
292 | .no_reconnect = 1, \ | 292 | .no_reconnect = 1, \ |
293 | .size_of_priv = sizeof(struct dib0700_state), \ | 293 | .size_of_priv = sizeof(struct dib0700_state), \ |
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h index 148386aba275..6dbf0c01e5e7 100644 --- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h +++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h | |||
@@ -127,6 +127,7 @@ | |||
127 | #define USB_PID_KYE_DVB_T_WARM 0x701f | 127 | #define USB_PID_KYE_DVB_T_WARM 0x701f |
128 | #define USB_PID_PCTV_200E 0x020e | 128 | #define USB_PID_PCTV_200E 0x020e |
129 | #define USB_PID_PCTV_400E 0x020f | 129 | #define USB_PID_PCTV_400E 0x020f |
130 | #define USB_PID_PCTV_450E 0x0222 | ||
130 | #define USB_PID_LITEON_DVB_T_COLD 0xf000 | 131 | #define USB_PID_LITEON_DVB_T_COLD 0xf000 |
131 | #define USB_PID_LITEON_DVB_T_WARM 0xf001 | 132 | #define USB_PID_LITEON_DVB_T_WARM 0xf001 |
132 | #define USB_PID_DIGIVOX_MINI_SL_COLD 0xe360 | 133 | #define USB_PID_DIGIVOX_MINI_SL_COLD 0xe360 |
diff --git a/drivers/media/dvb/dvb-usb/ttusb2.c b/drivers/media/dvb/dvb-usb/ttusb2.c index 95d29976ed78..88dc4367a2e3 100644 --- a/drivers/media/dvb/dvb-usb/ttusb2.c +++ b/drivers/media/dvb/dvb-usb/ttusb2.c | |||
@@ -184,6 +184,7 @@ static int ttusb2_probe(struct usb_interface *intf, | |||
184 | 184 | ||
185 | static struct usb_device_id ttusb2_table [] = { | 185 | static struct usb_device_id ttusb2_table [] = { |
186 | { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PCTV_400E) }, | 186 | { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PCTV_400E) }, |
187 | { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PCTV_450E) }, | ||
187 | {} /* Terminating entry */ | 188 | {} /* Terminating entry */ |
188 | }; | 189 | }; |
189 | MODULE_DEVICE_TABLE (usb, ttusb2_table); | 190 | MODULE_DEVICE_TABLE (usb, ttusb2_table); |
@@ -227,12 +228,16 @@ static struct dvb_usb_device_properties ttusb2_properties = { | |||
227 | 228 | ||
228 | .generic_bulk_ctrl_endpoint = 0x01, | 229 | .generic_bulk_ctrl_endpoint = 0x01, |
229 | 230 | ||
230 | .num_device_descs = 1, | 231 | .num_device_descs = 2, |
231 | .devices = { | 232 | .devices = { |
232 | { "Pinnacle 400e DVB-S USB2.0", | 233 | { "Pinnacle 400e DVB-S USB2.0", |
233 | { &ttusb2_table[0], NULL }, | 234 | { &ttusb2_table[0], NULL }, |
234 | { NULL }, | 235 | { NULL }, |
235 | }, | 236 | }, |
237 | { "Pinnacle 450e DVB-S USB2.0", | ||
238 | { &ttusb2_table[1], NULL }, | ||
239 | { NULL }, | ||
240 | }, | ||
236 | } | 241 | } |
237 | }; | 242 | }; |
238 | 243 | ||