diff options
| author | Michael Hunold <devnull@localhost> | 2003-03-17 21:21:56 +0000 |
|---|---|---|
| committer | Michael Hunold <devnull@localhost> | 2003-03-17 21:21:56 +0000 |
| commit | 0e0505bca61e2877a5283e37ad447f1496fb5503 (patch) | |
| tree | 480e781f36aebe33f461e4d73c16267cb054b0b5 /linux/drivers/media/video/dpc7146.c | |
| parent | 8dd52d823f399f39d02e35cbd32da30175d0429b (diff) | |
| download | mediapointer-dvb-s2-0e0505bca61e2877a5283e37ad447f1496fb5503.tar.gz mediapointer-dvb-s2-0e0505bca61e2877a5283e37ad447f1496fb5503.tar.bz2 | |
- Fixed the build-2.4 tree to compile with 2.4.18 kernels.
- Moved some generic stuff from budget-core.c to saa7146_core.c where it belongs
----------------------------------------------------------------------
Diffstat (limited to 'linux/drivers/media/video/dpc7146.c')
| -rw-r--r-- | linux/drivers/media/video/dpc7146.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/video/dpc7146.c b/linux/drivers/media/video/dpc7146.c index 4c524568f..2d0b45e9a 100644 --- a/linux/drivers/media/video/dpc7146.c +++ b/linux/drivers/media/video/dpc7146.c @@ -92,8 +92,7 @@ struct dpc int cur_input; /* current input */ }; -/* fixme: add vbi stuff here, look at dpc.c */ - +/* fixme: add vbi stuff here */ static int dpc_probe(struct saa7146_dev* dev) { struct dpc* dpc = 0; @@ -101,7 +100,7 @@ static int dpc_probe(struct saa7146_dev* dev) dpc = (struct dpc*)kmalloc(sizeof(struct dpc), GFP_KERNEL); if( NULL == dpc ) { - printk("dpc_v4l2.o: dpc_attach: not enough kernel memory.\n"); + printk("dpc_v4l2.o: dpc_probe: not enough kernel memory.\n"); return -ENOMEM; } memset(dpc, 0x0, sizeof(struct dpc)); @@ -202,7 +201,6 @@ static int dpc_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_data i2c_use_client(dpc->saa7111a); printk("dpc: found 'dpc7146 demonstration board'-%d.\n",dpc_num); - dpc_num++; /* the rest */ @@ -334,6 +332,8 @@ struct pci_device_id pci_tbl[] = { .subvendor = 0x0000, .subdevice = 0x0000, .driver_data = (unsigned long)&dpc, + }, { + .vendor = 0, } }; |