diff options
| author | Holger Waechtler <devnull@localhost> | 2003-04-29 14:58:02 +0000 |
|---|---|---|
| committer | Holger Waechtler <devnull@localhost> | 2003-04-29 14:58:02 +0000 |
| commit | 68d6df188770816736b28d6b65c8ee8ba0eaeb24 (patch) | |
| tree | 09a18422de1acb7256b7df115847e348bd3de78b /linux/drivers/media/dvb | |
| parent | cc5e492d0b600d12b8edc077323ee0197ffc348f (diff) | |
| download | mediapointer-dvb-s2-68d6df188770816736b28d6b65c8ee8ba0eaeb24.tar.gz mediapointer-dvb-s2-68d6df188770816736b28d6b65c8ee8ba0eaeb24.tar.bz2 | |
try to get the DVB-C volume control thing right, probe the MSP3400 only for DVB-C cards
Diffstat (limited to 'linux/drivers/media/dvb')
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/av7110.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/linux/drivers/media/dvb/ttpci/av7110.c b/linux/drivers/media/dvb/ttpci/av7110.c index c14d1a5f3..4f87b6a0b 100644 --- a/linux/drivers/media/dvb/ttpci/av7110.c +++ b/linux/drivers/media/dvb/ttpci/av7110.c @@ -4292,10 +4292,11 @@ int av7110_attach (struct saa7146_dev* dev, struct saa7146_pci_extension_data *p i2c_writereg(av7110, 0x20, 0x04, 0x00); /** - * some special handling for the Siemens DVB-C card... + * some special handling for the Siemens DVB-C cards... */ } else if ((dev->pci->subsystem_vendor == 0x110a) || - (dev->pci->subsystem_vendor == 0x13c2)) { + ((dev->pci->subsystem_vendor == 0x13c2) && + (dev->pci->subsystem_device == 0x1004))) { if (i2c_writereg(av7110, 0x80, 0x0, 0x80)==1) { i2c_writereg(av7110, 0x80, 0x0, 0); printk ("av7110: DVB-C analog module detected, " @@ -4310,8 +4311,7 @@ int av7110_attach (struct saa7146_dev* dev, struct saa7146_pci_extension_data *p msp_writereg(av7110, 0x12, 0x0007, 0x7f00); // SCART 1 volume msp_writereg(av7110, 0x12, 0x000d, 0x4800); // prescale SCART } else - av7110->adac_type = DVB_ADAC_TI; - + av7110->adac_type = DVB_ADAC_NONE; // switch DVB SCART on outcom(av7110, COMTYPE_AUDIODAC, MainSwitch, 1, 0); @@ -4324,7 +4324,7 @@ int av7110_attach (struct saa7146_dev* dev, struct saa7146_pci_extension_data *p av7110_setup_irc_config (av7110, 0); av7110_register(av7110); - + printk(KERN_INFO "av7110: found av7110-%d.\n",av7110_num); av7110_num++; return 0; |