summaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2007-09-03 09:55:49 +0200
committerJaroslav Kysela <perex@perex.cz>2007-10-16 15:59:44 +0200
commitc78c950d28df984e39ad028a90bcdadcd3eda3b6 (patch)
tree3353f01703a224b0c9be3b3d7bbb93cebea7c799 /sound/pci
parent8992e18db32f5df55fd4b458def7dccd2a5c3266 (diff)
downloadop-kernel-dev-c78c950d28df984e39ad028a90bcdadcd3eda3b6.zip
op-kernel-dev-c78c950d28df984e39ad028a90bcdadcd3eda3b6.tar.gz
[ALSA] cmipci: do not check for integrated FM/MIDI ports with chip version 37
Integrated MPU-401/OPL3 ports are available with chip version 39 and later, so we do not test for the port with version 37. Now that the test is known to work, we can again enable the MIDI port by default. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/cmipci.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c
index af266eb..fdc4615 100644
--- a/sound/pci/cmipci.c
+++ b/sound/pci/cmipci.c
@@ -2798,7 +2798,7 @@ static int __devinit snd_cmipci_create_fm(struct cmipci *cm, long fm_port)
if (!fm_port)
goto disable_fm;
- if (cm->chip_version > 33) {
+ if (cm->chip_version >= 39) {
/* first try FM regs in PCI port range */
iosynth = cm->iobase + CM_REG_FM_PCI;
err = snd_opl3_create(cm->card, iosynth, iosynth + 2,
@@ -2990,8 +2990,7 @@ static int __devinit snd_cmipci_create(struct snd_card *card, struct pci_dev *pc
return err;
}
- val = 0;
- if (cm->chip_version > 33 && mpu_port[dev] == 1) {
+ if (cm->chip_version >= 39) {
val = snd_cmipci_read_b(cm, CM_REG_MPU_PCI + 1);
if (val != 0x00 && val != 0xff) {
iomidi = cm->iobase + CM_REG_MPU_PCI;
@@ -2999,6 +2998,7 @@ static int __devinit snd_cmipci_create(struct snd_card *card, struct pci_dev *pc
}
}
if (!integrated_midi) {
+ val = 0;
iomidi = mpu_port[dev];
switch (iomidi) {
case 0x320: val = CM_VMPU_320; break;
OpenPOWER on IntegriCloud