summaryrefslogtreecommitdiffstats
path: root/sound/pci/cmipci.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2006-05-04 14:36:08 +0200
committerJaroslav Kysela <perex@suse.cz>2006-06-22 21:33:29 +0200
commitcab5c4c97a98e46359faa52e86787c1f0ccd773c (patch)
tree8de8992098044914809cc6ef2d9accdffc90095a /sound/pci/cmipci.c
parenta7306336e818fe83f08a476c91ae2616e7fb209f (diff)
downloadop-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>
Diffstat (limited to 'sound/pci/cmipci.c')
-rw-r--r--sound/pci/cmipci.c2
1 files changed, 1 insertions, 1 deletions
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];
OpenPOWER on IntegriCloud