summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/pvrusb2/pvrusb2-main.c
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/pvrusb2/pvrusb2-main.c')
-rw-r--r--linux/drivers/media/video/pvrusb2/pvrusb2-main.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-main.c b/linux/drivers/media/video/pvrusb2/pvrusb2-main.c
index 0003c7a07..8e22c93e0 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-main.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-main.c
@@ -62,11 +62,6 @@ MODULE_PARM_DESC(debug, "Debug trace mask");
static struct pvr2_sysfs_class *class_ptr = 0;
-static struct usb_device_id pvr_table[] = {
- { USB_DEVICE(0x2040, 0x2900) },
- { }
-};
-
static void pvr_setup_attach(struct pvr2_context *pvr)
{
/* Create association with v4l layer */
@@ -80,7 +75,7 @@ static int pvr_probe(struct usb_interface *intf,
struct pvr2_context *pvr;
/* Create underlying hardware interface */
- pvr = pvr2_context_create(intf,pvr_setup_attach);
+ pvr = pvr2_context_create(intf,devid,pvr_setup_attach);
if (!pvr) {
pvr2_trace(PVR2_TRACE_ERROR_LEGS,
"Failed to create hdw handler");
@@ -116,7 +111,7 @@ static struct usb_driver pvr_driver = {
owner: THIS_MODULE,
#endif
name: "pvrusb2",
- id_table: pvr_table,
+ id_table: pvr2_device_table,
probe: pvr_probe,
disconnect: pvr_disconnect
};
@@ -166,7 +161,7 @@ static void __exit pvr_exit(void)
module_init(pvr_init);
module_exit(pvr_exit);
-MODULE_DEVICE_TABLE (usb, pvr_table);
+MODULE_DEVICE_TABLE (usb, pvr2_device_table);
MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL");