summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-03-29 02:36:18 +0000
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-29 02:36:18 +0000
commit79e38b2e91236313fe56aa090ed33a0719763e97 (patch)
tree34593b13a22aaf2c2031a5285a19c460f66618f6 /linux/drivers/media/dvb
parent868c60ab580a0b1d3939600a6b9522886982528b (diff)
downloadmediapointer-dvb-s2-79e38b2e91236313fe56aa090ed33a0719763e97.tar.gz
mediapointer-dvb-s2-79e38b2e91236313fe56aa090ed33a0719763e97.tar.bz2
Add AVerMedia A310 USB IDs to CE6230 driver.
From: Juan Jesús García de Soria Lucena <skandalfo@gmail.com> The CE6230 DVB USB driver works correctly for the AVerMedia A310 USB2.0 DVB-T tuner. Add the required USB ID's and hardware names so that the driver will handle it. Priority: normal Signed-off-by: Juan Jesús García de Soria Lucena <skandalfo@gmail.com> Acked-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/dvb')
-rw-r--r--linux/drivers/media/dvb/dvb-usb/ce6230.c8
-rw-r--r--linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h1
2 files changed, 8 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/dvb-usb/ce6230.c b/linux/drivers/media/dvb/dvb-usb/ce6230.c
index 1682af62f..3ae3bde45 100644
--- a/linux/drivers/media/dvb/dvb-usb/ce6230.c
+++ b/linux/drivers/media/dvb/dvb-usb/ce6230.c
@@ -253,6 +253,7 @@ static int ce6230_probe(struct usb_interface *intf,
static struct usb_device_id ce6230_table[] = {
{ USB_DEVICE(USB_VID_INTEL, USB_PID_INTEL_CE9500) },
+ { USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_A310) },
{ } /* Terminating entry */
};
MODULE_DEVICE_TABLE(usb, ce6230_table);
@@ -287,13 +288,18 @@ static struct dvb_usb_device_properties ce6230_properties = {
.i2c_algo = &ce6230_i2c_algo,
- .num_device_descs = 1,
+ .num_device_descs = 2,
.devices = {
{
.name = "Intel CE9500 reference design",
.cold_ids = {NULL},
.warm_ids = {&ce6230_table[0], NULL},
},
+ {
+ .name = "AVerMedia A310 USB 2.0 DVB-T tuner",
+ .cold_ids = {NULL},
+ .warm_ids = {&ce6230_table[1], NULL},
+ },
}
};
diff --git a/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index dc7ea21cd..ffe2a7335 100644
--- a/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -167,6 +167,7 @@
#define USB_PID_AVERMEDIA_VOLAR_X 0xa815
#define USB_PID_AVERMEDIA_VOLAR_X_2 0x8150
#define USB_PID_AVERMEDIA_A309 0xa309
+#define USB_PID_AVERMEDIA_A310 0xa310
#define USB_PID_TECHNOTREND_CONNECT_S2400 0x3006
#define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY 0x005a
#define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY_2 0x0081