diff options
author | Takashi Iwai <tiwai@suse.de> | 2006-05-04 08:36:08 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-06-22 15:33:29 -0400 |
commit | cab5c4c97a98e46359faa52e86787c1f0ccd773c (patch) | |
tree | 8de8992098044914809cc6ef2d9accdffc90095a /sound | |
parent | a7306336e818fe83f08a476c91ae2616e7fb209f (diff) |
[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>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/pci/cmipci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c index 42ca92be18f9..cb475ada2ef1 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 | |||
2932 | } | 2932 | } |
2933 | 2933 | ||
2934 | integrated_midi = snd_cmipci_read_b(cm, CM_REG_MPU_PCI) != 0xff; | 2934 | integrated_midi = snd_cmipci_read_b(cm, CM_REG_MPU_PCI) != 0xff; |
2935 | if (integrated_midi) | 2935 | if (integrated_midi && mpu_port[dev] == 1) |
2936 | iomidi = cm->iobase + CM_REG_MPU_PCI; | 2936 | iomidi = cm->iobase + CM_REG_MPU_PCI; |
2937 | else { | 2937 | else { |
2938 | iomidi = mpu_port[dev]; | 2938 | iomidi = mpu_port[dev]; |