diff options
| author | Takashi Iwai <tiwai@suse.de> | 2006-05-04 14:36:08 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2006-06-22 21:33:29 +0200 |
| commit | cab5c4c97a98e46359faa52e86787c1f0ccd773c (patch) | |
| tree | 8de8992098044914809cc6ef2d9accdffc90095a | |
| parent | a7306336e818fe83f08a476c91ae2616e7fb209f (diff) | |
| download | op-kernel-dev-cab5c4c97a98e46359faa52e86787c1f0ccd773c.zip op-kernel-dev-cab5c4c97a98e46359faa52e86787c1f0ccd773c.tar.gz | |
[ALSA] cmipci - Disable integrated mpu401 as default
Enable the support of mpu401 PCI port only when mpu_port=1 module
option is given, i.e. disabled as default.
It turned out that the check of integrated midi port isn't perfect
and caused hang-ups on some boards.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | Documentation/sound/alsa/ALSA-Configuration.txt | 4 | ||||
| -rw-r--r-- | sound/pci/cmipci.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt index 3c09d9b..e5bfb0f7 100644 --- a/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/Documentation/sound/alsa/ALSA-Configuration.txt @@ -366,7 +366,9 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. Module for C-Media CMI8338 and 8738 PCI sound cards. - mpu_port - 0x300,0x310,0x320,0x330, 0 = disable (default) + mpu_port - 0x300,0x310,0x320,0x330 = legacy port, + 1 = integrated PCI port, + 0 = disable (default) fm_port - 0x388 (default), 0 = disable (default) soft_ac3 - Software-conversion of raw SPDIF packets (model 033 only) (default = 1) diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c index 42ca92b..cb475ad 100644 --- a/sound/pci/cmipci.c +++ b/sound/pci/cmipci.c @@ -2932,7 +2932,7 @@ static int __devinit snd_cmipci_create(struct snd_card *card, struct pci_dev *pc } integrated_midi = snd_cmipci_read_b(cm, CM_REG_MPU_PCI) != 0xff; - if (integrated_midi) + if (integrated_midi && mpu_port[dev] == 1) iomidi = cm->iobase + CM_REG_MPU_PCI; else { iomidi = mpu_port[dev]; |
