From e841743cf89630b111efa5feccde7ded4d96c5f7 Mon Sep 17 00:00:00 2001 From: Michael Hunold Date: Mon, 7 Jul 2003 11:28:54 +0000 Subject: Make the "ext_vv_data" informations a per-device information instead of a per-extension information. This is needed for the DVB-C cards, which seem to have swapped field order and need to propagate some video4linux specific stuff for the analog module to work. --- linux/drivers/media/common/saa7146_core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'linux/drivers/media/common/saa7146_core.c') diff --git a/linux/drivers/media/common/saa7146_core.c b/linux/drivers/media/common/saa7146_core.c index 51013c6b9..0bc053a2e 100644 --- a/linux/drivers/media/common/saa7146_core.c +++ b/linux/drivers/media/common/saa7146_core.c @@ -153,7 +153,7 @@ void saa7146_pgtable_build_single(struct pci_dev *pci, struct saa7146_pgtable *p ptr = pt->cpu; for (i = 0; i < length; i++, list++) { for (p = 0; p * 4096 < list->length; p++, ptr++) { - *ptr = sg_dma_address(list) - list->offset; + *ptr = sg_dma_address(list) - list->offset; // + p } } @@ -372,6 +372,9 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent dev->module = THIS_MODULE; init_waitqueue_head(&dev->i2c_wq); + /* set some default values */ + saa7146_write(dev, BCS_CTRL, 0x80400040); + if( 0 != ext->probe) { if( 0 != ext->probe(dev) ) { DEB_D(("ext->probe() failed for %p. skipping device.\n",dev)); @@ -390,9 +393,6 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent list_add_tail(&dev->item,&saa7146_devices); saa7146_num++; - /* set some default values */ - saa7146_write(dev, BCS_CTRL, 0x80400040); - err = 0; goto out; attach_error: -- cgit v1.2.3