summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/bttv-driver.c
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/bttv-driver.c')
-rw-r--r--linux/drivers/media/video/bttv-driver.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bttv-driver.c
index df30742ed..9e907b251 100644
--- a/linux/drivers/media/video/bttv-driver.c
+++ b/linux/drivers/media/video/bttv-driver.c
@@ -1,5 +1,5 @@
/*
- $Id: bttv-driver.c,v 1.16 2004/09/23 13:58:19 kraxel Exp $
+ $Id: bttv-driver.c,v 1.17 2004/09/30 12:21:15 kraxel Exp $
bttv - Bt848 frame grabber driver
@@ -4028,7 +4028,6 @@ static struct pci_driver bttv_pci_driver = {
static int bttv_init_module(void)
{
- int rc;
bttv_num = 0;
printk(KERN_INFO "bttv: driver version %d.%d.%d loaded\n",
@@ -4053,13 +4052,7 @@ static int bttv_init_module(void)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
bus_register(&bttv_sub_bus_type);
#endif
- rc = pci_module_init(&bttv_pci_driver);
- if (-ENODEV == rc) {
- /* plenty of people trying to use bttv for the cx2388x ... */
- if (NULL != pci_find_device(0x14f1, 0x8800, NULL))
- printk("bttv doesn't support your Conexant 2388x card.\n");
- }
- return rc;
+ return pci_module_init(&bttv_pci_driver);
}
static void bttv_cleanup_module(void)